From 86c963e8534aecaa1b1c016acae1753028221257 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 6 Sep 2019 23:45:08 +0200 Subject: [PATCH] Update Android Qt 5 packages to 5.13.1 --- devel/qt5/rebase-all-patches.sh | 2 +- devel/qt5/rebase-patches.sh | 2 +- devel/versions.sh | 2 +- .../0001-Disable-mapboxgl.patch | 4 +- ...1-Fix-clang-libc-build-under-Android.patch | 8 +-- ...002-Fix-androiddeployqt-search-paths.patch | 4 +- ...003-Support-pkg-config-under-Android.patch | 6 +- .../0004-Android-Fix-build-with-NDKr20.patch | 35 ------------ .../0004-Use-pkg-config-to-find-libjpeg.patch | 24 ++++++++ qt5/android-aarch64/PKGBUILD | 56 ++++++++++--------- .../0001-Disable-mapboxgl.patch | 4 +- ...1-Fix-clang-libc-build-under-Android.patch | 8 +-- ...002-Fix-androiddeployqt-search-paths.patch | 4 +- ...003-Support-pkg-config-under-Android.patch | 6 +- .../0004-Android-Fix-build-with-NDKr20.patch | 35 ------------ .../0004-Use-pkg-config-to-find-libjpeg.patch | 24 ++++++++ qt5/android-armv7a-eabi/PKGBUILD | 56 ++++++++++--------- .../0001-Disable-mapboxgl.patch | 4 +- ...1-Fix-clang-libc-build-under-Android.patch | 8 +-- ...002-Fix-androiddeployqt-search-paths.patch | 4 +- ...003-Support-pkg-config-under-Android.patch | 6 +- .../0004-Android-Fix-build-with-NDKr20.patch | 35 ------------ .../0004-Use-pkg-config-to-find-libjpeg.patch | 24 ++++++++ qt5/android-x86-64/PKGBUILD | 56 ++++++++++--------- 24 files changed, 201 insertions(+), 216 deletions(-) delete mode 100644 qt5/android-aarch64/0004-Android-Fix-build-with-NDKr20.patch create mode 100644 qt5/android-aarch64/0004-Use-pkg-config-to-find-libjpeg.patch delete mode 100644 qt5/android-armv7a-eabi/0004-Android-Fix-build-with-NDKr20.patch create mode 100644 qt5/android-armv7a-eabi/0004-Use-pkg-config-to-find-libjpeg.patch delete mode 100644 qt5/android-x86-64/0004-Android-Fix-build-with-NDKr20.patch create mode 100644 qt5/android-x86-64/0004-Use-pkg-config-to-find-libjpeg.patch diff --git a/devel/qt5/rebase-all-patches.sh b/devel/qt5/rebase-all-patches.sh index 16a58a38..ae244b0c 100755 --- a/devel/qt5/rebase-all-patches.sh +++ b/devel/qt5/rebase-all-patches.sh @@ -13,6 +13,6 @@ for r in "$QT_GIT_REPOS_DIR/qt"*; do [[ $repo == '5ct' || $repo == '5ct-code' || $repo == 'repotools' || $repo == 'webkit' ]] && continue pushd "$r" > /dev/null msg "Rebasing repository $repo ..." - "$scriptdir/rebase-patches.sh" "$@" + in_loop=1 "$scriptdir/rebase-patches.sh" "$@" popd > /dev/null done diff --git a/devel/qt5/rebase-patches.sh b/devel/qt5/rebase-patches.sh index b680c5b6..52a67a28 100755 --- a/devel/qt5/rebase-patches.sh +++ b/devel/qt5/rebase-patches.sh @@ -20,7 +20,7 @@ newversionbranch=$newversion-$newbranchsuffix branch_count=$(git branch | grep -- "$newversionbranch" | wc -l) if [[ $branch_count -ge 1 ]]; then msg2 "Branch for new version $newversionbranch already exists. Likely already rebased (otherwise, use continue-rebase-patches.sh)." - continue + [[ $in_loop ]] && continue || exit -1 fi # determine branch from old version diff --git a/devel/versions.sh b/devel/versions.sh index f8d69fa8..f28cd9ec 100755 --- a/devel/versions.sh +++ b/devel/versions.sh @@ -12,7 +12,7 @@ declare -A versions=( [blackwidowcontrol]=1.0.1 [dbus-soundrecorder]=1.2.3 [geocoordinatecalculator]=1.1.3 - [qt5]=5.13.0 + [qt5]=5.13.1 ) declare -A github_names=( [c++utilities]=cpp-utilities diff --git a/qt5/android-aarch64/0001-Disable-mapboxgl.patch b/qt5/android-aarch64/0001-Disable-mapboxgl.patch index dc11162e..45b9c353 100644 --- a/qt5/android-aarch64/0001-Disable-mapboxgl.patch +++ b/qt5/android-aarch64/0001-Disable-mapboxgl.patch @@ -1,4 +1,4 @@ -From 398cf8a783a1886d998e91253080fdafd1b79e38 Mon Sep 17 00:00:00 2001 +From dbe68d96e7da8ba5e5484e6ad0bbd78c9b0a8eec Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:29:59 +0100 Subject: [PATCH] Disable mapboxgl @@ -25,5 +25,5 @@ index b81ad34a..98308c97 100644 - } -} -- -2.22.0 +2.23.0 diff --git a/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch b/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch index 780f0b24..05e4091c 100644 --- a/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch +++ b/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch @@ -1,4 +1,4 @@ -From 5db5bdabc2587048072f3dbd98e9041905943d84 Mon Sep 17 00:00:00 2001 +From 2c8ca36b5f87ccfc039c0b669c80f21205769758 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:28:07 +0100 Subject: [PATCH 1/4] Fix clang/libc++ build under Android @@ -8,11 +8,11 @@ Subject: [PATCH 1/4] Fix clang/libc++ build under Android 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index 20c6efee16..4ccde62cf0 100644 +index 05b7979142..83d030793b 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -30,11 +30,12 @@ QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info - QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a + QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -nostdlib++ equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a -QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \ @@ -36,5 +36,5 @@ index 20c6efee16..4ccde62cf0 100644 ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "") -- -2.22.0 +2.23.0 diff --git a/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch b/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch index 794127e9..f01167eb 100644 --- a/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch +++ b/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch @@ -1,4 +1,4 @@ -From 0c8762606483fc8ad571ebdd38e8b6c8f39ee0b4 Mon Sep 17 00:00:00 2001 +From 996c53a388705a0bbf778faaf7660efad98e1eff Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:31:30 +0100 Subject: [PATCH 2/4] Fix androiddeployqt search paths @@ -30,5 +30,5 @@ index 01c392f8f9..9600d657cb 100644 while (!remainingDependencies.isEmpty()) { -- -2.22.0 +2.23.0 diff --git a/qt5/android-aarch64/0003-Support-pkg-config-under-Android.patch b/qt5/android-aarch64/0003-Support-pkg-config-under-Android.patch index f8a51887..66a21a05 100644 --- a/qt5/android-aarch64/0003-Support-pkg-config-under-Android.patch +++ b/qt5/android-aarch64/0003-Support-pkg-config-under-Android.patch @@ -1,4 +1,4 @@ -From 0b61b7828c156b0621342f0f4dd855b561b9f6f0 Mon Sep 17 00:00:00 2001 +From a71a1223328539ee403884a24d1dbc5a685d40dd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 7 Apr 2019 09:54:49 +0200 Subject: [PATCH 3/4] Support pkg-config under Android @@ -9,7 +9,7 @@ from https://aur.archlinux.org/cgit/aur.git/commit/?h=android-aarch64-qt5&id=d90 1 file changed, 3 insertions(+) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index 4ccde62cf0..d448291fe8 100644 +index 83d030793b..8f145a2bb7 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -53,3 +53,6 @@ else: \ @@ -20,5 +20,5 @@ index 4ccde62cf0..d448291fe8 100644 +QMAKE_PKG_CONFIG = $$[QT_INSTALL_PREFIX] +QMAKE_PKG_CONFIG = android-$$section(QMAKE_PKG_CONFIG, /, 3, 3)-pkg-config -- -2.22.0 +2.23.0 diff --git a/qt5/android-aarch64/0004-Android-Fix-build-with-NDKr20.patch b/qt5/android-aarch64/0004-Android-Fix-build-with-NDKr20.patch deleted file mode 100644 index af693c5d..00000000 --- a/qt5/android-aarch64/0004-Android-Fix-build-with-NDKr20.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 43bba0798fb7367a67a7802832012d1a6b1662bd Mon Sep 17 00:00:00 2001 -From: BogDan Vatra -Date: Thu, 13 Jun 2019 09:38:48 +0300 -Subject: [PATCH 4/4] Android: Fix build with NDKr20 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In NDK r20 clang adds -lc++ library automatically which leads to link fails. - -[ChangeLog][Android] Fix NDK r20 linking. - -Task-number: QTBUG-76293 -Change-Id: I6675180a3555d1ad9047d7a9ce1c03333cf0ab35 -Reviewed-by: Jörg Bornemann ---- - mkspecs/android-clang/qmake.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index d448291fe8..8f145a2bb7 100644 ---- a/mkspecs/android-clang/qmake.conf -+++ b/mkspecs/android-clang/qmake.conf -@@ -27,7 +27,7 @@ else: equals(ANDROID_TARGET_ARCH, x86_64): \ - - QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info - --QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -+QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -nostdlib++ - equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a - - QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \ --- -2.22.0 - diff --git a/qt5/android-aarch64/0004-Use-pkg-config-to-find-libjpeg.patch b/qt5/android-aarch64/0004-Use-pkg-config-to-find-libjpeg.patch new file mode 100644 index 00000000..25f5b8db --- /dev/null +++ b/qt5/android-aarch64/0004-Use-pkg-config-to-find-libjpeg.patch @@ -0,0 +1,24 @@ +From 9cd435c730949e29104bbfa2bdd82ed2c662ca3d Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Sat, 7 Sep 2019 13:21:37 +0200 +Subject: [PATCH 4/4] Use pkg-config to find libjpeg + +--- + src/gui/configure.json | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 6280b4dfa2..206f83984a 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -373,6 +373,7 @@ + }, + "headers": "jpeglib.h", + "sources": [ ++ { "type": "pkgConfig", "args": "libjpeg" }, + { "libs": "-llibjpeg", "condition": "config.msvc" }, + "-ljpeg" + ] +-- +2.23.0 + diff --git a/qt5/android-aarch64/PKGBUILD b/qt5/android-aarch64/PKGBUILD index d58c254c..ed23394e 100644 --- a/qt5/android-aarch64/PKGBUILD +++ b/qt5/android-aarch64/PKGBUILD @@ -10,8 +10,8 @@ _android_arch=arm64-v8a _android_platform=22 pkgname=android-$_pkg_arch-qt5 -pkgver=5.13.0 -pkgrel=2 +pkgver=5.13.1 +pkgrel=1 pkgdesc="Qt 5 for Android" arch=('x86_64') url='https://www.qt.io' @@ -35,7 +35,10 @@ depends=('java-runtime-headless-openjdk<=8' "android-platform-$_android_platform" 'android-sdk' 'android-sdk-build-tools' - 'android-sdk-platform-tools') + 'android-sdk-platform-tools' + "android-$_pkg_arch-zlib" + "android-$_pkg_arch-libpng" + "android-$_pkg_arch-libjpeg-turbo") groups=('android-qt5') conflicts=("android-qt5-${_android_arch}") replaces=("android-qt5-${_android_arch}") @@ -68,14 +71,14 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg '0001-Fix-clang-libc-build-under-Android.patch' '0002-Fix-androiddeployqt-search-paths.patch' '0003-Support-pkg-config-under-Android.patch' - '0004-Android-Fix-build-with-NDKr20.patch' + '0004-Use-pkg-config-to-find-libjpeg.patch' '0001-Disable-mapboxgl.patch') -sha256sums=('2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6' - 'f38adf77126c692bf61bb90f31742539b942edc45975a375b87ff3a86a058adf' - '3f018a24adfc6567fff35605731f7c34fde456db071221941d1a3c6330601741' - 'a79934eb95c131eba9b776c387339c8bf1b20ad3ac0eea629b3ee3470679ee61' - 'c1c732f65fcb97c57969f76e1257caa6f6c2872b65b438447a92cc7a43b4182f' - 'b4755f99e6f9ab1df2650e13fa395b9706ee248d21309fed4270e69d201521c1') +sha256sums=('adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e' + '29bcb93f9c79ad4b0709efa42694ed917b6e4cfce69a805e79a7dc3144be7765' + '7a5520311ba2edee2ffcd546cd6e08248c8f73deed33bd8075649577f8cb1446' + '5c3f0725f3c27263661ff5ebb4b279e4483de8ed70dee4fe42a84d31b3f2e4a9' + '4f3ba22616040a2979bfdf840b44bf105374ea2fac866c42977ad7ec6e87ddcc' + '6151b784050f9d4ef3eec22dd33360d3f566d4834592f1171df91a10c95fab77') prepare() { export ANDROID_MINIMUM_PLATFORM=${_android_platform} @@ -87,7 +90,7 @@ prepare() { patch -Np1 -i "../../0001-Fix-clang-libc-build-under-Android.patch" #patch -Np1 -i "../../0002-Fix-androiddeployqt-search-paths.patch" patch -Np1 -i "../../0003-Support-pkg-config-under-Android.patch" - patch -Np1 -i "../../0004-Android-Fix-build-with-NDKr20.patch" + patch -Np1 -i "../../0004-Use-pkg-config-to-find-libjpeg.patch" popd pushd qtlocation @@ -117,10 +120,9 @@ build() { configue_opts=" -confirm-license -opensource - -silent - -prefix ${ANDROID_LIBS} - -examplesdir ${ANDROID_LIBS}/share/qt5/examples - -testsdir ${ANDROID_LIBS}/share/qt5/tests + -prefix ${ANDROID_PREFIX} + -examplesdir ${ANDROID_PREFIX_SHARE}/qt5/examples + -testsdir ${ANDROID_PREFIX_SHARE}/qt5/tests -xplatform android-clang -nomake tests -nomake examples @@ -130,13 +132,17 @@ build() { -android-toolchain-version 4.9 -skip qtserialport -no-warnings-are-errors - -no-pkg-config - -qt-zlib + -pkg-config + -system-zlib + -system-libpng + -system-libjpeg -qt-freetype -openssl-runtime - -android-arch ${_android_arch} + -android-arch ${ANDROID_ABI} -android-ndk-platform ${ANDROID_NDK_PLATFORM} - -I${ANDROID_LIBS}/include" + -recheck-all + -optimized-qmake + -I${ANDROID_PREFIX}/include" [[ $ANDROID_DEBUG_BUILD ]] \ && configue_opts+=' -debug-and-release' \ @@ -166,14 +172,14 @@ package() { make INSTALL_ROOT=${pkgdir} install - find ${pkgdir}/${ANDROID_LIBS}/bin -type f ! -name '*.pl' -exec strip {} \; - find ${pkgdir}/${ANDROID_LIBS}/lib -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; - find ${pkgdir}/${ANDROID_LIBS}/lib -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} {} \; - find ${pkgdir}/${ANDROID_LIBS}/plugins -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; - find ${pkgdir}/${ANDROID_LIBS}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX_BIN} -type f ! -name '*.pl' -exec strip {} \; + find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX}/plugins -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; # fix plugin path in Android-specific dependency file - sed -i 's/\"plugins\//\"lib\/qt\/plugins\//g' ${pkgdir}/${ANDROID_LIBS}/lib/*-android-dependencies.xml + sed -i 's/\"plugins\//\"lib\/qt\/plugins\//g' ${pkgdir}/${ANDROID_PREFIX_LIB}/*-android-dependencies.xml # drop QMAKE_PRL_BUILD_DIR because reference the build dir find "${pkgdir}/" -type f -name '*.prl' \ diff --git a/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch b/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch index dc11162e..45b9c353 100644 --- a/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch +++ b/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch @@ -1,4 +1,4 @@ -From 398cf8a783a1886d998e91253080fdafd1b79e38 Mon Sep 17 00:00:00 2001 +From dbe68d96e7da8ba5e5484e6ad0bbd78c9b0a8eec Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:29:59 +0100 Subject: [PATCH] Disable mapboxgl @@ -25,5 +25,5 @@ index b81ad34a..98308c97 100644 - } -} -- -2.22.0 +2.23.0 diff --git a/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch b/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch index 780f0b24..05e4091c 100644 --- a/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch +++ b/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch @@ -1,4 +1,4 @@ -From 5db5bdabc2587048072f3dbd98e9041905943d84 Mon Sep 17 00:00:00 2001 +From 2c8ca36b5f87ccfc039c0b669c80f21205769758 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:28:07 +0100 Subject: [PATCH 1/4] Fix clang/libc++ build under Android @@ -8,11 +8,11 @@ Subject: [PATCH 1/4] Fix clang/libc++ build under Android 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index 20c6efee16..4ccde62cf0 100644 +index 05b7979142..83d030793b 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -30,11 +30,12 @@ QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info - QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a + QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -nostdlib++ equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a -QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \ @@ -36,5 +36,5 @@ index 20c6efee16..4ccde62cf0 100644 ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "") -- -2.22.0 +2.23.0 diff --git a/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch b/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch index 794127e9..f01167eb 100644 --- a/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch +++ b/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch @@ -1,4 +1,4 @@ -From 0c8762606483fc8ad571ebdd38e8b6c8f39ee0b4 Mon Sep 17 00:00:00 2001 +From 996c53a388705a0bbf778faaf7660efad98e1eff Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:31:30 +0100 Subject: [PATCH 2/4] Fix androiddeployqt search paths @@ -30,5 +30,5 @@ index 01c392f8f9..9600d657cb 100644 while (!remainingDependencies.isEmpty()) { -- -2.22.0 +2.23.0 diff --git a/qt5/android-armv7a-eabi/0003-Support-pkg-config-under-Android.patch b/qt5/android-armv7a-eabi/0003-Support-pkg-config-under-Android.patch index f8a51887..66a21a05 100644 --- a/qt5/android-armv7a-eabi/0003-Support-pkg-config-under-Android.patch +++ b/qt5/android-armv7a-eabi/0003-Support-pkg-config-under-Android.patch @@ -1,4 +1,4 @@ -From 0b61b7828c156b0621342f0f4dd855b561b9f6f0 Mon Sep 17 00:00:00 2001 +From a71a1223328539ee403884a24d1dbc5a685d40dd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 7 Apr 2019 09:54:49 +0200 Subject: [PATCH 3/4] Support pkg-config under Android @@ -9,7 +9,7 @@ from https://aur.archlinux.org/cgit/aur.git/commit/?h=android-aarch64-qt5&id=d90 1 file changed, 3 insertions(+) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index 4ccde62cf0..d448291fe8 100644 +index 83d030793b..8f145a2bb7 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -53,3 +53,6 @@ else: \ @@ -20,5 +20,5 @@ index 4ccde62cf0..d448291fe8 100644 +QMAKE_PKG_CONFIG = $$[QT_INSTALL_PREFIX] +QMAKE_PKG_CONFIG = android-$$section(QMAKE_PKG_CONFIG, /, 3, 3)-pkg-config -- -2.22.0 +2.23.0 diff --git a/qt5/android-armv7a-eabi/0004-Android-Fix-build-with-NDKr20.patch b/qt5/android-armv7a-eabi/0004-Android-Fix-build-with-NDKr20.patch deleted file mode 100644 index af693c5d..00000000 --- a/qt5/android-armv7a-eabi/0004-Android-Fix-build-with-NDKr20.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 43bba0798fb7367a67a7802832012d1a6b1662bd Mon Sep 17 00:00:00 2001 -From: BogDan Vatra -Date: Thu, 13 Jun 2019 09:38:48 +0300 -Subject: [PATCH 4/4] Android: Fix build with NDKr20 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In NDK r20 clang adds -lc++ library automatically which leads to link fails. - -[ChangeLog][Android] Fix NDK r20 linking. - -Task-number: QTBUG-76293 -Change-Id: I6675180a3555d1ad9047d7a9ce1c03333cf0ab35 -Reviewed-by: Jörg Bornemann ---- - mkspecs/android-clang/qmake.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index d448291fe8..8f145a2bb7 100644 ---- a/mkspecs/android-clang/qmake.conf -+++ b/mkspecs/android-clang/qmake.conf -@@ -27,7 +27,7 @@ else: equals(ANDROID_TARGET_ARCH, x86_64): \ - - QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info - --QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -+QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -nostdlib++ - equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a - - QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \ --- -2.22.0 - diff --git a/qt5/android-armv7a-eabi/0004-Use-pkg-config-to-find-libjpeg.patch b/qt5/android-armv7a-eabi/0004-Use-pkg-config-to-find-libjpeg.patch new file mode 100644 index 00000000..25f5b8db --- /dev/null +++ b/qt5/android-armv7a-eabi/0004-Use-pkg-config-to-find-libjpeg.patch @@ -0,0 +1,24 @@ +From 9cd435c730949e29104bbfa2bdd82ed2c662ca3d Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Sat, 7 Sep 2019 13:21:37 +0200 +Subject: [PATCH 4/4] Use pkg-config to find libjpeg + +--- + src/gui/configure.json | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 6280b4dfa2..206f83984a 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -373,6 +373,7 @@ + }, + "headers": "jpeglib.h", + "sources": [ ++ { "type": "pkgConfig", "args": "libjpeg" }, + { "libs": "-llibjpeg", "condition": "config.msvc" }, + "-ljpeg" + ] +-- +2.23.0 + diff --git a/qt5/android-armv7a-eabi/PKGBUILD b/qt5/android-armv7a-eabi/PKGBUILD index 25b7101f..3485e5c8 100644 --- a/qt5/android-armv7a-eabi/PKGBUILD +++ b/qt5/android-armv7a-eabi/PKGBUILD @@ -10,8 +10,8 @@ _android_arch=armeabi-v7a _android_platform=21 pkgname=android-$_pkg_arch-qt5 -pkgver=5.13.0 -pkgrel=2 +pkgver=5.13.1 +pkgrel=1 pkgdesc="Qt 5 for Android" arch=('x86_64') url='https://www.qt.io' @@ -35,7 +35,10 @@ depends=('java-runtime-headless-openjdk<=8' "android-platform-$_android_platform" 'android-sdk' 'android-sdk-build-tools' - 'android-sdk-platform-tools') + 'android-sdk-platform-tools' + "android-$_pkg_arch-zlib" + "android-$_pkg_arch-libpng" + "android-$_pkg_arch-libjpeg-turbo") groups=('android-qt5') conflicts=("android-qt5-${_android_arch}") replaces=("android-qt5-${_android_arch}") @@ -68,14 +71,14 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg '0001-Fix-clang-libc-build-under-Android.patch' '0002-Fix-androiddeployqt-search-paths.patch' '0003-Support-pkg-config-under-Android.patch' - '0004-Android-Fix-build-with-NDKr20.patch' + '0004-Use-pkg-config-to-find-libjpeg.patch' '0001-Disable-mapboxgl.patch') -sha256sums=('2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6' - 'f38adf77126c692bf61bb90f31742539b942edc45975a375b87ff3a86a058adf' - '3f018a24adfc6567fff35605731f7c34fde456db071221941d1a3c6330601741' - 'a79934eb95c131eba9b776c387339c8bf1b20ad3ac0eea629b3ee3470679ee61' - 'c1c732f65fcb97c57969f76e1257caa6f6c2872b65b438447a92cc7a43b4182f' - 'b4755f99e6f9ab1df2650e13fa395b9706ee248d21309fed4270e69d201521c1') +sha256sums=('adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e' + '29bcb93f9c79ad4b0709efa42694ed917b6e4cfce69a805e79a7dc3144be7765' + '7a5520311ba2edee2ffcd546cd6e08248c8f73deed33bd8075649577f8cb1446' + '5c3f0725f3c27263661ff5ebb4b279e4483de8ed70dee4fe42a84d31b3f2e4a9' + '4f3ba22616040a2979bfdf840b44bf105374ea2fac866c42977ad7ec6e87ddcc' + '6151b784050f9d4ef3eec22dd33360d3f566d4834592f1171df91a10c95fab77') prepare() { export ANDROID_MINIMUM_PLATFORM=${_android_platform} @@ -87,7 +90,7 @@ prepare() { patch -Np1 -i "../../0001-Fix-clang-libc-build-under-Android.patch" #patch -Np1 -i "../../0002-Fix-androiddeployqt-search-paths.patch" patch -Np1 -i "../../0003-Support-pkg-config-under-Android.patch" - patch -Np1 -i "../../0004-Android-Fix-build-with-NDKr20.patch" + patch -Np1 -i "../../0004-Use-pkg-config-to-find-libjpeg.patch" popd pushd qtlocation @@ -117,10 +120,9 @@ build() { configue_opts=" -confirm-license -opensource - -silent - -prefix ${ANDROID_LIBS} - -examplesdir ${ANDROID_LIBS}/share/qt5/examples - -testsdir ${ANDROID_LIBS}/share/qt5/tests + -prefix ${ANDROID_PREFIX} + -examplesdir ${ANDROID_PREFIX_SHARE}/qt5/examples + -testsdir ${ANDROID_PREFIX_SHARE}/qt5/tests -xplatform android-clang -nomake tests -nomake examples @@ -130,13 +132,17 @@ build() { -android-toolchain-version 4.9 -skip qtserialport -no-warnings-are-errors - -no-pkg-config - -qt-zlib + -pkg-config + -system-zlib + -system-libpng + -system-libjpeg -qt-freetype -openssl-runtime - -android-arch ${_android_arch} + -android-arch ${ANDROID_ABI} -android-ndk-platform ${ANDROID_NDK_PLATFORM} - -I${ANDROID_LIBS}/include" + -recheck-all + -optimized-qmake + -I${ANDROID_PREFIX}/include" [[ $ANDROID_DEBUG_BUILD ]] \ && configue_opts+=' -debug-and-release' \ @@ -166,14 +172,14 @@ package() { make INSTALL_ROOT=${pkgdir} install - find ${pkgdir}/${ANDROID_LIBS}/bin -type f ! -name '*.pl' -exec strip {} \; - find ${pkgdir}/${ANDROID_LIBS}/lib -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; - find ${pkgdir}/${ANDROID_LIBS}/lib -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} {} \; - find ${pkgdir}/${ANDROID_LIBS}/plugins -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; - find ${pkgdir}/${ANDROID_LIBS}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX_BIN} -type f ! -name '*.pl' -exec strip {} \; + find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX}/plugins -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; # fix plugin path in Android-specific dependency file - sed -i 's/\"plugins\//\"lib\/qt\/plugins\//g' ${pkgdir}/${ANDROID_LIBS}/lib/*-android-dependencies.xml + sed -i 's/\"plugins\//\"lib\/qt\/plugins\//g' ${pkgdir}/${ANDROID_PREFIX_LIB}/*-android-dependencies.xml # drop QMAKE_PRL_BUILD_DIR because reference the build dir find "${pkgdir}/" -type f -name '*.prl' \ diff --git a/qt5/android-x86-64/0001-Disable-mapboxgl.patch b/qt5/android-x86-64/0001-Disable-mapboxgl.patch index dc11162e..45b9c353 100644 --- a/qt5/android-x86-64/0001-Disable-mapboxgl.patch +++ b/qt5/android-x86-64/0001-Disable-mapboxgl.patch @@ -1,4 +1,4 @@ -From 398cf8a783a1886d998e91253080fdafd1b79e38 Mon Sep 17 00:00:00 2001 +From dbe68d96e7da8ba5e5484e6ad0bbd78c9b0a8eec Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:29:59 +0100 Subject: [PATCH] Disable mapboxgl @@ -25,5 +25,5 @@ index b81ad34a..98308c97 100644 - } -} -- -2.22.0 +2.23.0 diff --git a/qt5/android-x86-64/0001-Fix-clang-libc-build-under-Android.patch b/qt5/android-x86-64/0001-Fix-clang-libc-build-under-Android.patch index 780f0b24..05e4091c 100644 --- a/qt5/android-x86-64/0001-Fix-clang-libc-build-under-Android.patch +++ b/qt5/android-x86-64/0001-Fix-clang-libc-build-under-Android.patch @@ -1,4 +1,4 @@ -From 5db5bdabc2587048072f3dbd98e9041905943d84 Mon Sep 17 00:00:00 2001 +From 2c8ca36b5f87ccfc039c0b669c80f21205769758 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:28:07 +0100 Subject: [PATCH 1/4] Fix clang/libc++ build under Android @@ -8,11 +8,11 @@ Subject: [PATCH 1/4] Fix clang/libc++ build under Android 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index 20c6efee16..4ccde62cf0 100644 +index 05b7979142..83d030793b 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -30,11 +30,12 @@ QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info - QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a + QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -nostdlib++ equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a -QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \ @@ -36,5 +36,5 @@ index 20c6efee16..4ccde62cf0 100644 ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "") -- -2.22.0 +2.23.0 diff --git a/qt5/android-x86-64/0002-Fix-androiddeployqt-search-paths.patch b/qt5/android-x86-64/0002-Fix-androiddeployqt-search-paths.patch index 794127e9..f01167eb 100644 --- a/qt5/android-x86-64/0002-Fix-androiddeployqt-search-paths.patch +++ b/qt5/android-x86-64/0002-Fix-androiddeployqt-search-paths.patch @@ -1,4 +1,4 @@ -From 0c8762606483fc8ad571ebdd38e8b6c8f39ee0b4 Mon Sep 17 00:00:00 2001 +From 996c53a388705a0bbf778faaf7660efad98e1eff Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:31:30 +0100 Subject: [PATCH 2/4] Fix androiddeployqt search paths @@ -30,5 +30,5 @@ index 01c392f8f9..9600d657cb 100644 while (!remainingDependencies.isEmpty()) { -- -2.22.0 +2.23.0 diff --git a/qt5/android-x86-64/0003-Support-pkg-config-under-Android.patch b/qt5/android-x86-64/0003-Support-pkg-config-under-Android.patch index f8a51887..66a21a05 100644 --- a/qt5/android-x86-64/0003-Support-pkg-config-under-Android.patch +++ b/qt5/android-x86-64/0003-Support-pkg-config-under-Android.patch @@ -1,4 +1,4 @@ -From 0b61b7828c156b0621342f0f4dd855b561b9f6f0 Mon Sep 17 00:00:00 2001 +From a71a1223328539ee403884a24d1dbc5a685d40dd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 7 Apr 2019 09:54:49 +0200 Subject: [PATCH 3/4] Support pkg-config under Android @@ -9,7 +9,7 @@ from https://aur.archlinux.org/cgit/aur.git/commit/?h=android-aarch64-qt5&id=d90 1 file changed, 3 insertions(+) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index 4ccde62cf0..d448291fe8 100644 +index 83d030793b..8f145a2bb7 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -53,3 +53,6 @@ else: \ @@ -20,5 +20,5 @@ index 4ccde62cf0..d448291fe8 100644 +QMAKE_PKG_CONFIG = $$[QT_INSTALL_PREFIX] +QMAKE_PKG_CONFIG = android-$$section(QMAKE_PKG_CONFIG, /, 3, 3)-pkg-config -- -2.22.0 +2.23.0 diff --git a/qt5/android-x86-64/0004-Android-Fix-build-with-NDKr20.patch b/qt5/android-x86-64/0004-Android-Fix-build-with-NDKr20.patch deleted file mode 100644 index af693c5d..00000000 --- a/qt5/android-x86-64/0004-Android-Fix-build-with-NDKr20.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 43bba0798fb7367a67a7802832012d1a6b1662bd Mon Sep 17 00:00:00 2001 -From: BogDan Vatra -Date: Thu, 13 Jun 2019 09:38:48 +0300 -Subject: [PATCH 4/4] Android: Fix build with NDKr20 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In NDK r20 clang adds -lc++ library automatically which leads to link fails. - -[ChangeLog][Android] Fix NDK r20 linking. - -Task-number: QTBUG-76293 -Change-Id: I6675180a3555d1ad9047d7a9ce1c03333cf0ab35 -Reviewed-by: Jörg Bornemann ---- - mkspecs/android-clang/qmake.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index d448291fe8..8f145a2bb7 100644 ---- a/mkspecs/android-clang/qmake.conf -+++ b/mkspecs/android-clang/qmake.conf -@@ -27,7 +27,7 @@ else: equals(ANDROID_TARGET_ARCH, x86_64): \ - - QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info - --QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -+QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -nostdlib++ - equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a - - QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \ --- -2.22.0 - diff --git a/qt5/android-x86-64/0004-Use-pkg-config-to-find-libjpeg.patch b/qt5/android-x86-64/0004-Use-pkg-config-to-find-libjpeg.patch new file mode 100644 index 00000000..25f5b8db --- /dev/null +++ b/qt5/android-x86-64/0004-Use-pkg-config-to-find-libjpeg.patch @@ -0,0 +1,24 @@ +From 9cd435c730949e29104bbfa2bdd82ed2c662ca3d Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Sat, 7 Sep 2019 13:21:37 +0200 +Subject: [PATCH 4/4] Use pkg-config to find libjpeg + +--- + src/gui/configure.json | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gui/configure.json b/src/gui/configure.json +index 6280b4dfa2..206f83984a 100644 +--- a/src/gui/configure.json ++++ b/src/gui/configure.json +@@ -373,6 +373,7 @@ + }, + "headers": "jpeglib.h", + "sources": [ ++ { "type": "pkgConfig", "args": "libjpeg" }, + { "libs": "-llibjpeg", "condition": "config.msvc" }, + "-ljpeg" + ] +-- +2.23.0 + diff --git a/qt5/android-x86-64/PKGBUILD b/qt5/android-x86-64/PKGBUILD index 11b66597..77dc8d1f 100644 --- a/qt5/android-x86-64/PKGBUILD +++ b/qt5/android-x86-64/PKGBUILD @@ -10,8 +10,8 @@ _android_arch=x86_64 _android_platform=22 pkgname=android-$_pkg_arch-qt5 -pkgver=5.13.0 -pkgrel=2 +pkgver=5.13.1 +pkgrel=1 pkgdesc="Qt 5 for Android" arch=('x86_64') url='https://www.qt.io' @@ -35,7 +35,10 @@ depends=('java-runtime-headless-openjdk<=8' "android-platform-$_android_platform" 'android-sdk' 'android-sdk-build-tools' - 'android-sdk-platform-tools') + 'android-sdk-platform-tools' + "android-$_pkg_arch-zlib" + "android-$_pkg_arch-libpng" + "android-$_pkg_arch-libjpeg-turbo") groups=('android-qt5') conflicts=("android-qt5-${_android_arch}") replaces=("android-qt5-${_android_arch}") @@ -68,14 +71,14 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg '0001-Fix-clang-libc-build-under-Android.patch' '0002-Fix-androiddeployqt-search-paths.patch' '0003-Support-pkg-config-under-Android.patch' - '0004-Android-Fix-build-with-NDKr20.patch' + '0004-Use-pkg-config-to-find-libjpeg.patch' '0001-Disable-mapboxgl.patch') -sha256sums=('2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6' - 'f38adf77126c692bf61bb90f31742539b942edc45975a375b87ff3a86a058adf' - '3f018a24adfc6567fff35605731f7c34fde456db071221941d1a3c6330601741' - 'a79934eb95c131eba9b776c387339c8bf1b20ad3ac0eea629b3ee3470679ee61' - 'c1c732f65fcb97c57969f76e1257caa6f6c2872b65b438447a92cc7a43b4182f' - 'b4755f99e6f9ab1df2650e13fa395b9706ee248d21309fed4270e69d201521c1') +sha256sums=('adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e' + '29bcb93f9c79ad4b0709efa42694ed917b6e4cfce69a805e79a7dc3144be7765' + '7a5520311ba2edee2ffcd546cd6e08248c8f73deed33bd8075649577f8cb1446' + '5c3f0725f3c27263661ff5ebb4b279e4483de8ed70dee4fe42a84d31b3f2e4a9' + '4f3ba22616040a2979bfdf840b44bf105374ea2fac866c42977ad7ec6e87ddcc' + '6151b784050f9d4ef3eec22dd33360d3f566d4834592f1171df91a10c95fab77') prepare() { export ANDROID_MINIMUM_PLATFORM=${_android_platform} @@ -87,7 +90,7 @@ prepare() { patch -Np1 -i "../../0001-Fix-clang-libc-build-under-Android.patch" #patch -Np1 -i "../../0002-Fix-androiddeployqt-search-paths.patch" patch -Np1 -i "../../0003-Support-pkg-config-under-Android.patch" - patch -Np1 -i "../../0004-Android-Fix-build-with-NDKr20.patch" + patch -Np1 -i "../../0004-Use-pkg-config-to-find-libjpeg.patch" popd pushd qtlocation @@ -117,10 +120,9 @@ build() { configue_opts=" -confirm-license -opensource - -silent - -prefix ${ANDROID_LIBS} - -examplesdir ${ANDROID_LIBS}/share/qt5/examples - -testsdir ${ANDROID_LIBS}/share/qt5/tests + -prefix ${ANDROID_PREFIX} + -examplesdir ${ANDROID_PREFIX_SHARE}/qt5/examples + -testsdir ${ANDROID_PREFIX_SHARE}/qt5/tests -xplatform android-clang -nomake tests -nomake examples @@ -130,13 +132,17 @@ build() { -android-toolchain-version 4.9 -skip qtserialport -no-warnings-are-errors - -no-pkg-config - -qt-zlib + -pkg-config + -system-zlib + -system-libpng + -system-libjpeg -qt-freetype -openssl-runtime - -android-arch ${_android_arch} + -android-arch ${ANDROID_ABI} -android-ndk-platform ${ANDROID_NDK_PLATFORM} - -I${ANDROID_LIBS}/include" + -recheck-all + -optimized-qmake + -I${ANDROID_PREFIX}/include" [[ $ANDROID_DEBUG_BUILD ]] \ && configue_opts+=' -debug-and-release' \ @@ -166,14 +172,14 @@ package() { make INSTALL_ROOT=${pkgdir} install - find ${pkgdir}/${ANDROID_LIBS}/bin -type f ! -name '*.pl' -exec strip {} \; - find ${pkgdir}/${ANDROID_LIBS}/lib -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; - find ${pkgdir}/${ANDROID_LIBS}/lib -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} {} \; - find ${pkgdir}/${ANDROID_LIBS}/plugins -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; - find ${pkgdir}/${ANDROID_LIBS}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX_BIN} -type f ! -name '*.pl' -exec strip {} \; + find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX}/plugins -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; + find ${pkgdir}/${ANDROID_PREFIX}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \; # fix plugin path in Android-specific dependency file - sed -i 's/\"plugins\//\"lib\/qt\/plugins\//g' ${pkgdir}/${ANDROID_LIBS}/lib/*-android-dependencies.xml + sed -i 's/\"plugins\//\"lib\/qt\/plugins\//g' ${pkgdir}/${ANDROID_PREFIX_LIB}/*-android-dependencies.xml # drop QMAKE_PRL_BUILD_DIR because reference the build dir find "${pkgdir}/" -type f -name '*.prl' \