diff --git a/qt5/android-aarch64/0001-Disable-mapboxgl.patch b/qt5/android-aarch64/0001-Disable-mapboxgl.patch index a4f4a64e..dc11162e 100644 --- a/qt5/android-aarch64/0001-Disable-mapboxgl.patch +++ b/qt5/android-aarch64/0001-Disable-mapboxgl.patch @@ -1,4 +1,4 @@ -From 18c7eaf37f456f840c25b3c99f2cf5c449ce9867 Mon Sep 17 00:00:00 2001 +From 398cf8a783a1886d998e91253080fdafd1b79e38 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.21.0 +2.22.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 21ec0e2b..780f0b24 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,17 +1,17 @@ -From dbf4c67996681535e7cdd50e223a2d1998a1370d Mon Sep 17 00:00:00 2001 +From 5db5bdabc2587048072f3dbd98e9041905943d84 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:28:07 +0100 -Subject: [PATCH 1/3] Fix clang/libc++ build under Android +Subject: [PATCH 1/4] Fix clang/libc++ build under Android --- mkspecs/android-clang/qmake.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index a077c70cba..5cc6ee79e2 100644 +index 20c6efee16..4ccde62cf0 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf -@@ -34,11 +34,12 @@ QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info +@@ -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 equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a @@ -26,7 +26,7 @@ index a077c70cba..5cc6ee79e2 100644 ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH -@@ -48,6 +49,8 @@ ANDROID_USE_LLVM = true +@@ -44,6 +45,8 @@ ANDROID_USE_LLVM = true exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so): \ ANDROID_CXX_STL_LIBS = -lc++ @@ -36,5 +36,5 @@ index a077c70cba..5cc6ee79e2 100644 ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "") -- -2.21.0 +2.22.0 diff --git a/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch b/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch index b7e1cd77..794127e9 100644 --- a/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch +++ b/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch @@ -1,14 +1,14 @@ -From 2652e041beda3ded84f9c13424718587828389d7 Mon Sep 17 00:00:00 2001 +From 0c8762606483fc8ad571ebdd38e8b6c8f39ee0b4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:31:30 +0100 -Subject: [PATCH 2/3] Fix androiddeployqt search paths +Subject: [PATCH 2/4] Fix androiddeployqt search paths --- src/tools/androiddeployqt/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp -index 20b1befc38..71ff5515bb 100644 +index 01c392f8f9..9600d657cb 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1721,7 +1721,7 @@ bool scanImports(Options *options, QSet *usedDependencies) @@ -20,7 +20,7 @@ index 20b1befc38..71ff5515bb 100644 importPaths += shellQuote(rootPath); for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths)) importPaths += shellQuote(qmlImportPath); -@@ -1852,7 +1852,7 @@ bool readDependencies(Options *options) +@@ -1857,7 +1857,7 @@ bool readDependencies(Options *options) return false; // Jam in the dependencies of the platform plugin, since the application will crash without it @@ -30,5 +30,5 @@ index 20b1befc38..71ff5515bb 100644 while (!remainingDependencies.isEmpty()) { -- -2.21.0 +2.22.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 77153d23..f8a51887 100644 --- a/qt5/android-aarch64/0003-Support-pkg-config-under-Android.patch +++ b/qt5/android-aarch64/0003-Support-pkg-config-under-Android.patch @@ -1,11 +1,7 @@ -<<<<<<< HEAD -From fc643d716b33387759d9be0eeff250deb624d5e9 Mon Sep 17 00:00:00 2001 -======= -From f6f962530496138ad1f21e5d851603882de7ad1d Mon Sep 17 00:00:00 2001 ->>>>>>> 21a7125... WIP: Android +From 0b61b7828c156b0621342f0f4dd855b561b9f6f0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 7 Apr 2019 09:54:49 +0200 -Subject: [PATCH 3/3] Support pkg-config under Android +Subject: [PATCH 3/4] Support pkg-config under Android from https://aur.archlinux.org/cgit/aur.git/commit/?h=android-aarch64-qt5&id=d901da324b2ceea2ac99b48137cb82b2bd920c77 --- @@ -13,10 +9,10 @@ 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 5cc6ee79e2..c731b4ef23 100644 +index 4ccde62cf0..d448291fe8 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf -@@ -57,3 +57,6 @@ else: \ +@@ -53,3 +53,6 @@ else: \ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz include(../common/android-base-tail.conf) @@ -24,5 +20,5 @@ index 5cc6ee79e2..c731b4ef23 100644 +QMAKE_PKG_CONFIG = $$[QT_INSTALL_PREFIX] +QMAKE_PKG_CONFIG = android-$$section(QMAKE_PKG_CONFIG, /, 3, 3)-pkg-config -- -2.21.0 +2.22.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 new file mode 100644 index 00000000..af693c5d --- /dev/null +++ b/qt5/android-aarch64/0004-Android-Fix-build-with-NDKr20.patch @@ -0,0 +1,35 @@ +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/PKGBUILD b/qt5/android-aarch64/PKGBUILD index 132f2476..136f6e7a 100644 --- a/qt5/android-aarch64/PKGBUILD +++ b/qt5/android-aarch64/PKGBUILD @@ -10,7 +10,7 @@ _android_arch=arm64-v8a _android_platform=22 pkgname=android-$_pkg_arch-qt5 -pkgver=5.12.3 +pkgver=5.13.0 pkgrel=1 pkgdesc="Qt 5 for Android" arch=('x86_64') @@ -67,13 +67,15 @@ 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' '0001-Disable-mapboxgl.patch' 'android-env.sh') -sha256sums=('6462ac74c00ff466487d8ef8d0922971aa5b1d5b33c0753308ec9d57711f5a42' - '028f7cac1ff187353f17c3686edd6c3af2f4c20a19db4cca61982482e63cb8bb' - '7d4620df70a1c843f547c7af1044f68a182bfcb08130eec8129dc1c71a0cd500' - '2e47a471c6fb5c3d43817435eba87d1cbf8643dfb7d34ed7dc0a9f2042d9d91b' - '155427860cf724ed4da72d7c3b9b8e32459b89aefc68cb9e68a9a25d7d02cc93' +sha256sums=('2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6' + 'f38adf77126c692bf61bb90f31742539b942edc45975a375b87ff3a86a058adf' + '3f018a24adfc6567fff35605731f7c34fde456db071221941d1a3c6330601741' + 'a79934eb95c131eba9b776c387339c8bf1b20ad3ac0eea629b3ee3470679ee61' + 'c1c732f65fcb97c57969f76e1257caa6f6c2872b65b438447a92cc7a43b4182f' + 'b4755f99e6f9ab1df2650e13fa395b9706ee248d21309fed4270e69d201521c1' 'c4bffe85aa675c1c1a76dda36c154154eccfcee353db6cafe2318c3848e23fb1') prepare() { @@ -86,6 +88,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" popd pushd qtlocation diff --git a/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch b/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch index a4f4a64e..dc11162e 100644 --- a/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch +++ b/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch @@ -1,4 +1,4 @@ -From 18c7eaf37f456f840c25b3c99f2cf5c449ce9867 Mon Sep 17 00:00:00 2001 +From 398cf8a783a1886d998e91253080fdafd1b79e38 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.21.0 +2.22.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 21ec0e2b..780f0b24 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,17 +1,17 @@ -From dbf4c67996681535e7cdd50e223a2d1998a1370d Mon Sep 17 00:00:00 2001 +From 5db5bdabc2587048072f3dbd98e9041905943d84 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:28:07 +0100 -Subject: [PATCH 1/3] Fix clang/libc++ build under Android +Subject: [PATCH 1/4] Fix clang/libc++ build under Android --- mkspecs/android-clang/qmake.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index a077c70cba..5cc6ee79e2 100644 +index 20c6efee16..4ccde62cf0 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf -@@ -34,11 +34,12 @@ QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info +@@ -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 equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a @@ -26,7 +26,7 @@ index a077c70cba..5cc6ee79e2 100644 ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH -@@ -48,6 +49,8 @@ ANDROID_USE_LLVM = true +@@ -44,6 +45,8 @@ ANDROID_USE_LLVM = true exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so): \ ANDROID_CXX_STL_LIBS = -lc++ @@ -36,5 +36,5 @@ index a077c70cba..5cc6ee79e2 100644 ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "") -- -2.21.0 +2.22.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 b7e1cd77..794127e9 100644 --- a/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch +++ b/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch @@ -1,14 +1,14 @@ -From 2652e041beda3ded84f9c13424718587828389d7 Mon Sep 17 00:00:00 2001 +From 0c8762606483fc8ad571ebdd38e8b6c8f39ee0b4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:31:30 +0100 -Subject: [PATCH 2/3] Fix androiddeployqt search paths +Subject: [PATCH 2/4] Fix androiddeployqt search paths --- src/tools/androiddeployqt/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp -index 20b1befc38..71ff5515bb 100644 +index 01c392f8f9..9600d657cb 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -1721,7 +1721,7 @@ bool scanImports(Options *options, QSet *usedDependencies) @@ -20,7 +20,7 @@ index 20b1befc38..71ff5515bb 100644 importPaths += shellQuote(rootPath); for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths)) importPaths += shellQuote(qmlImportPath); -@@ -1852,7 +1852,7 @@ bool readDependencies(Options *options) +@@ -1857,7 +1857,7 @@ bool readDependencies(Options *options) return false; // Jam in the dependencies of the platform plugin, since the application will crash without it @@ -30,5 +30,5 @@ index 20b1befc38..71ff5515bb 100644 while (!remainingDependencies.isEmpty()) { -- -2.21.0 +2.22.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 77153d23..f8a51887 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,11 +1,7 @@ -<<<<<<< HEAD -From fc643d716b33387759d9be0eeff250deb624d5e9 Mon Sep 17 00:00:00 2001 -======= -From f6f962530496138ad1f21e5d851603882de7ad1d Mon Sep 17 00:00:00 2001 ->>>>>>> 21a7125... WIP: Android +From 0b61b7828c156b0621342f0f4dd855b561b9f6f0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 7 Apr 2019 09:54:49 +0200 -Subject: [PATCH 3/3] Support pkg-config under Android +Subject: [PATCH 3/4] Support pkg-config under Android from https://aur.archlinux.org/cgit/aur.git/commit/?h=android-aarch64-qt5&id=d901da324b2ceea2ac99b48137cb82b2bd920c77 --- @@ -13,10 +9,10 @@ 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 5cc6ee79e2..c731b4ef23 100644 +index 4ccde62cf0..d448291fe8 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf -@@ -57,3 +57,6 @@ else: \ +@@ -53,3 +53,6 @@ else: \ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz include(../common/android-base-tail.conf) @@ -24,5 +20,5 @@ index 5cc6ee79e2..c731b4ef23 100644 +QMAKE_PKG_CONFIG = $$[QT_INSTALL_PREFIX] +QMAKE_PKG_CONFIG = android-$$section(QMAKE_PKG_CONFIG, /, 3, 3)-pkg-config -- -2.21.0 +2.22.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 new file mode 100644 index 00000000..af693c5d --- /dev/null +++ b/qt5/android-armv7a-eabi/0004-Android-Fix-build-with-NDKr20.patch @@ -0,0 +1,35 @@ +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/PKGBUILD b/qt5/android-armv7a-eabi/PKGBUILD index 1a925708..12627fd5 100644 --- a/qt5/android-armv7a-eabi/PKGBUILD +++ b/qt5/android-armv7a-eabi/PKGBUILD @@ -10,7 +10,7 @@ _android_arch=armeabi-v7a _android_platform=21 pkgname=android-$_pkg_arch-qt5 -pkgver=5.12.3 +pkgver=5.13.0 pkgrel=1 pkgdesc="Qt 5 for Android" arch=('x86_64') @@ -67,13 +67,15 @@ 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' '0001-Disable-mapboxgl.patch' 'android-env.sh') -sha256sums=('6462ac74c00ff466487d8ef8d0922971aa5b1d5b33c0753308ec9d57711f5a42' - '028f7cac1ff187353f17c3686edd6c3af2f4c20a19db4cca61982482e63cb8bb' - '7d4620df70a1c843f547c7af1044f68a182bfcb08130eec8129dc1c71a0cd500' - '2e47a471c6fb5c3d43817435eba87d1cbf8643dfb7d34ed7dc0a9f2042d9d91b' - '155427860cf724ed4da72d7c3b9b8e32459b89aefc68cb9e68a9a25d7d02cc93' +sha256sums=('2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6' + 'f38adf77126c692bf61bb90f31742539b942edc45975a375b87ff3a86a058adf' + '3f018a24adfc6567fff35605731f7c34fde456db071221941d1a3c6330601741' + 'a79934eb95c131eba9b776c387339c8bf1b20ad3ac0eea629b3ee3470679ee61' + 'c1c732f65fcb97c57969f76e1257caa6f6c2872b65b438447a92cc7a43b4182f' + 'b4755f99e6f9ab1df2650e13fa395b9706ee248d21309fed4270e69d201521c1' 'c4bffe85aa675c1c1a76dda36c154154eccfcee353db6cafe2318c3848e23fb1') prepare() { @@ -86,6 +88,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" popd pushd qtlocation