From af263907ca64b90e3028f09094bbba3d4f876582 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Fri, 21 Jun 2019 21:27:32 +0200 Subject: [PATCH] main/libofono-qt: rename from ofono-qt and move to newer sources (!408) [ci:skip-vercheck] libofono-qt switched to newer sources but uses a different version numbering system --- .../01-update_code_compatible_qt5.patch | 0 .../02-change_signals_Q_SIGNALS_Q_SLOTS.patch | 0 ...allManager_to_match_latest_ofono_api.patch | 0 ...4-set_errors_on_dial_and_sendMessage.patch | 0 ..._connman_interface_to_the_new_layout.patch | 0 .../06-fix_unit_tests.patch | 0 .../07-simplify_code_logic.patch | 0 .../08-add-delivery-report.patch | 0 .../09-createMultiparty-synchronous.patch | 0 .../10-use_right_modem_objpath.patch | 0 .../11_use_libdir.patch | 0 main/libofono-qt/APKBUILD | 33 ++++++++++++ main/libphonenumber/APKBUILD | 12 +---- main/ofono-qt/APKBUILD | 52 ------------------- main/telepathy-ofono/APKBUILD | 2 +- 15 files changed, 36 insertions(+), 63 deletions(-) rename main/{ofono-qt => libofono-qt}/01-update_code_compatible_qt5.patch (100%) rename main/{ofono-qt => libofono-qt}/02-change_signals_Q_SIGNALS_Q_SLOTS.patch (100%) rename main/{ofono-qt => libofono-qt}/03-update_MessageManager_VoiceCallManager_to_match_latest_ofono_api.patch (100%) rename main/{ofono-qt => libofono-qt}/04-set_errors_on_dial_and_sendMessage.patch (100%) rename main/{ofono-qt => libofono-qt}/05-update_connman_interface_to_the_new_layout.patch (100%) rename main/{ofono-qt => libofono-qt}/06-fix_unit_tests.patch (100%) rename main/{ofono-qt => libofono-qt}/07-simplify_code_logic.patch (100%) rename main/{ofono-qt => libofono-qt}/08-add-delivery-report.patch (100%) rename main/{ofono-qt => libofono-qt}/09-createMultiparty-synchronous.patch (100%) rename main/{ofono-qt => libofono-qt}/10-use_right_modem_objpath.patch (100%) rename main/{ofono-qt => libofono-qt}/11_use_libdir.patch (100%) create mode 100644 main/libofono-qt/APKBUILD delete mode 100644 main/ofono-qt/APKBUILD diff --git a/main/ofono-qt/01-update_code_compatible_qt5.patch b/main/libofono-qt/01-update_code_compatible_qt5.patch similarity index 100% rename from main/ofono-qt/01-update_code_compatible_qt5.patch rename to main/libofono-qt/01-update_code_compatible_qt5.patch diff --git a/main/ofono-qt/02-change_signals_Q_SIGNALS_Q_SLOTS.patch b/main/libofono-qt/02-change_signals_Q_SIGNALS_Q_SLOTS.patch similarity index 100% rename from main/ofono-qt/02-change_signals_Q_SIGNALS_Q_SLOTS.patch rename to main/libofono-qt/02-change_signals_Q_SIGNALS_Q_SLOTS.patch diff --git a/main/ofono-qt/03-update_MessageManager_VoiceCallManager_to_match_latest_ofono_api.patch b/main/libofono-qt/03-update_MessageManager_VoiceCallManager_to_match_latest_ofono_api.patch similarity index 100% rename from main/ofono-qt/03-update_MessageManager_VoiceCallManager_to_match_latest_ofono_api.patch rename to main/libofono-qt/03-update_MessageManager_VoiceCallManager_to_match_latest_ofono_api.patch diff --git a/main/ofono-qt/04-set_errors_on_dial_and_sendMessage.patch b/main/libofono-qt/04-set_errors_on_dial_and_sendMessage.patch similarity index 100% rename from main/ofono-qt/04-set_errors_on_dial_and_sendMessage.patch rename to main/libofono-qt/04-set_errors_on_dial_and_sendMessage.patch diff --git a/main/ofono-qt/05-update_connman_interface_to_the_new_layout.patch b/main/libofono-qt/05-update_connman_interface_to_the_new_layout.patch similarity index 100% rename from main/ofono-qt/05-update_connman_interface_to_the_new_layout.patch rename to main/libofono-qt/05-update_connman_interface_to_the_new_layout.patch diff --git a/main/ofono-qt/06-fix_unit_tests.patch b/main/libofono-qt/06-fix_unit_tests.patch similarity index 100% rename from main/ofono-qt/06-fix_unit_tests.patch rename to main/libofono-qt/06-fix_unit_tests.patch diff --git a/main/ofono-qt/07-simplify_code_logic.patch b/main/libofono-qt/07-simplify_code_logic.patch similarity index 100% rename from main/ofono-qt/07-simplify_code_logic.patch rename to main/libofono-qt/07-simplify_code_logic.patch diff --git a/main/ofono-qt/08-add-delivery-report.patch b/main/libofono-qt/08-add-delivery-report.patch similarity index 100% rename from main/ofono-qt/08-add-delivery-report.patch rename to main/libofono-qt/08-add-delivery-report.patch diff --git a/main/ofono-qt/09-createMultiparty-synchronous.patch b/main/libofono-qt/09-createMultiparty-synchronous.patch similarity index 100% rename from main/ofono-qt/09-createMultiparty-synchronous.patch rename to main/libofono-qt/09-createMultiparty-synchronous.patch diff --git a/main/ofono-qt/10-use_right_modem_objpath.patch b/main/libofono-qt/10-use_right_modem_objpath.patch similarity index 100% rename from main/ofono-qt/10-use_right_modem_objpath.patch rename to main/libofono-qt/10-use_right_modem_objpath.patch diff --git a/main/ofono-qt/11_use_libdir.patch b/main/libofono-qt/11_use_libdir.patch similarity index 100% rename from main/ofono-qt/11_use_libdir.patch rename to main/libofono-qt/11_use_libdir.patch diff --git a/main/libofono-qt/APKBUILD b/main/libofono-qt/APKBUILD new file mode 100644 index 000000000..762d8ce82 --- /dev/null +++ b/main/libofono-qt/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Bhushan Shah +# Maintainer: Bhushan Shah +pkgname=libofono-qt +pkgver=0.54_git20190116 +pkgrel=0 +_commit="8132b5ff5035c468807c291b4fa30d7e0a54cba4" +pkgdesc="This package contains ofono-qt, a Qt-based library that providesbindings to oFono." +url="https://github.com/Kaffeine/libofono-qt" +arch="all" +license="LGPL-2.1-or-later" +depends="qt5-qtbase" +makedepends="qt5-qtbase-dev doxygen texlive" +subpackages="$pkgname-dev" +source="$pkgname-$_commit.tar.gz::https://github.com/Kaffeine/$pkgname/archive/$_commit.tar.gz" +options="!check" # No tests suite +builddir="$srcdir/$pkgname-$_commit" + +build() { + qmake-qt5 + make +} + +package() { + INSTALL_ROOT="$pkgdir" make install + + # Remove tests + rm -r "$pkgdir"/opt + + mkdir -p "$pkgdir"/usr/share/doc/$pkgname + mv doc/html "$pkgdir"/usr/share/doc/$pkgname/ +} + +sha512sums="80d7e92fff9a9d8798a050aa6a42dee553d5b44cfae0ee540523032ff116d95c9388f4e1302b9ab063dbf3076e1a8bedea8c67d8a5904d966a5d22a410b6218f libofono-qt-8132b5ff5035c468807c291b4fa30d7e0a54cba4.tar.gz" diff --git a/main/libphonenumber/APKBUILD b/main/libphonenumber/APKBUILD index 37e0393a6..d91bfdc97 100644 --- a/main/libphonenumber/APKBUILD +++ b/main/libphonenumber/APKBUILD @@ -19,18 +19,10 @@ build() { # this is mainly due to usage of boost templates and gtest library which also uses the templates. export CCACHE_DISABLE=1 cd "$builddir/cpp" - if [ "$CBUILD" != "$CHOST" ]; then - CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" - fi cmake \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - -DGTEST_SOURCE_DIR="$srcdir"/googletest-release-$_gtestversion/googletest \ - ${CMAKE_CROSSOPTS} + -DCMAKE_INSTALL_LIBDIR=lib make } diff --git a/main/ofono-qt/APKBUILD b/main/ofono-qt/APKBUILD deleted file mode 100644 index f00575cea..000000000 --- a/main/ofono-qt/APKBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# Contributor: Bhushan Shah -# Maintainer: Bhushan Shah -pkgname=ofono-qt -pkgver=1.5.0 -pkgrel=0 -pkgdesc="This package contains ofono-qt, a Qt-based library that providesbindings to oFono." -url="https://gitorious.org/meego-cellular/ofono-qt" -arch="all" -license="LGPL2" -depends="qt5-qtbase" -makedepends="qt5-qtbase-dev doxygen" -subpackages="$pkgname-dev" -# original tarball at : https://gitorious.org/meego-cellular/ofono-qt?p=meego-cellular:ofono-qt.git;a=snapshot;h=a4008e9432fc4b79675fb536498e245c433f2c2c;sf=tgz is unicorn -# it generates random hash everytime.. use tar which doesn't change hash -source="$pkgname-$pkgver.tar.gz::https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/ofono-qt/1.5+git20120419+bcf0c04-0ubuntu8~gcc5.1/ofono-qt_1.5+git20120419+bcf0c04.orig.tar.gz - 01-update_code_compatible_qt5.patch - 02-change_signals_Q_SIGNALS_Q_SLOTS.patch - 03-update_MessageManager_VoiceCallManager_to_match_latest_ofono_api.patch - 04-set_errors_on_dial_and_sendMessage.patch - 05-update_connman_interface_to_the_new_layout.patch - 06-fix_unit_tests.patch - 07-simplify_code_logic.patch - 08-add-delivery-report.patch - 09-createMultiparty-synchronous.patch - 10-use_right_modem_objpath.patch - 11_use_libdir.patch -" -builddir="$srcdir/ofono-qt-1.5+git20120419+bcf0c04" - -build() { - cd "$builddir" - qmake-qt5 - make -} - -package() { - cd "$builddir" - make install INSTALL_ROOT="$pkgdir" -} - -sha512sums="9d3700bc74496b9254b71d3a07c19216fe5eafa5115e891ef948df2a4aa078efefcee2f30404df823d0078061a601be8de4922cfe6eb09d93b1a72048de688a3 ofono-qt-1.5.0.tar.gz -49524d23c47b964dc2226d2201fa1346183e569db34e2ddc4671e082ba0454eb129ad069596d151add9b187e1e82525d14356725463a1675b736244abd58a188 01-update_code_compatible_qt5.patch -ff0895139c5c19f06604ed0fcc438b7a4490ebf76949d754315cd756d31df175f27f8064329a3a4a7c85570bafa98ca932e17ed08a679e6334342c4e65246a8c 02-change_signals_Q_SIGNALS_Q_SLOTS.patch -877472a50f76d031a9a01e598da1bbf0a72af45682666ee607ee27d3f3644a151520b377698d21dc04cff25deb5e69a130779832bfdbfb61bd6a2c9734db2365 03-update_MessageManager_VoiceCallManager_to_match_latest_ofono_api.patch -0f253430df38bbc1343d36ac33e5e61c0bf064fadc66ad64f7059c36685279e371689a7b079a81e7d14aca1d715db2fded13102989ea9cb6e41a842e087d905f 04-set_errors_on_dial_and_sendMessage.patch -100cdfaf9055608a4deff68f9280ea89e571c9019204d123c8c94e20d24e3a3b6c1b04733d6619cadc10aeeb4fb25d3e4ecb021c569d0292c6321ef795758a38 05-update_connman_interface_to_the_new_layout.patch -d21381ac2feea0886361340bac98d6ee41e2752a1c8015fff68bbb047beb3f86be78c503a78c9b799b7c56ed53811f1d74bb142edcb762c57e7d134f71d34592 06-fix_unit_tests.patch -bd675910829f0e81cd60d4e03712c534765ac0ded3db33dd741539950ef7c0d679ae202d4459f421f6c0d8e680fcf1f22f8936169437495e348f71b7a268569a 07-simplify_code_logic.patch -0a84bd858b448a7b6c4557bc031a8cbb058fd469139e6a805dd6296edfa3f71a4502882cc98fe94b6c778a75065c69a332d0432c0d53554e646f4beb542fe5ae 08-add-delivery-report.patch -9a6cb397698da9932daa07beed8daa921ad662cac3996e0a1828324e68861958b32af74b20751c94234752e0ee23c2dc51a7a1fcb4695635b3ec988d01516a81 09-createMultiparty-synchronous.patch -91824cd8c76d5ff18f083f2aabad28f8bed7978cb019622800aa75d8e80db1372ab535d43fc242a30db9be69a39e7366b0b198e1202c8e1a33ea185567275059 10-use_right_modem_objpath.patch -2cbb98b59d4d3947d39c34afb5b09f71c28c717238b28ecf3513e5f8255828e07680604479f4225ed2ae5661088d50d982cf462f62f7866cd90540983392444c 11_use_libdir.patch" diff --git a/main/telepathy-ofono/APKBUILD b/main/telepathy-ofono/APKBUILD index 414663241..967a6f1df 100644 --- a/main/telepathy-ofono/APKBUILD +++ b/main/telepathy-ofono/APKBUILD @@ -8,7 +8,7 @@ pkgdesc="Telepathy oFono connection manager" url="https://github.com/TelepathyIM/telepathy-ofono" arch="all" license="LGPL-2.1-or-later" -makedepends="cmake qt5-qtbase-dev libphonenumber-dev telepathy-qt-dev sqlite-dev telepathy-mission-control-dev ofono-qt-dev" +makedepends="cmake qt5-qtbase-dev libphonenumber-dev telepathy-qt-dev sqlite-dev telepathy-mission-control-dev libofono-qt-dev" source="$pkgname-$_commit.tar.gz::https://github.com/telepathyim/$pkgname/archive/$_commit.tar.gz" options="!check" # no tests builddir="$srcdir/$pkgname-$_commit"