Updated to Qt 5.14.

1 files changed, 27 insertions, 36 deletions

diff --git a/PKGBUILD b/PKGBUILD
index aa625d00b6ef..0e954dead395 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 _android_arch=x86
 
 pkgname=android-${_android_arch}-qt5
-pkgver=5.13.2
+pkgver=5.14.0
 pkgrel=1
 pkgdesc="Qt 5 for Android"
 arch=('any')
@@ -31,10 +31,12 @@ depends=('java-runtime-headless-openjdk<=8'
          'android-sdk'
          'android-sdk-build-tools'
          'android-sdk-platform-tools'
-         "android-${_android_arch}-zlib"
-         "android-${_android_arch}-libpng"
          "android-${_android_arch}-libjpeg-turbo"
-         "android-${_android_arch}-openssl")
+         "android-${_android_arch}-libpng"
+         "android-${_android_arch}-libtiff"
+         "android-${_android_arch}-libwebp"
+         "android-${_android_arch}-openssl"
+         "android-${_android_arch}-zlib")
 groups=('android-qt5')
 
 case "$_android_arch" in
@@ -62,15 +64,11 @@ options=(!strip !buildflags staticlibs !emptydirs)
 _pkgfqn="qt-everywhere-src-${pkgver}"
 install="${pkgname}.install"
 source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkgver}/single/${_pkgfqn}.tar.xz"
-        "0001-Fix-clang-libc-build-under-Android.patch"
-        "0002-Disable-mapboxgl.patch"
-        "0003-Support-pkg-config-under-Android.patch"
-        "0004-Use-pkg-config-to-find-libjpeg.patch")
-md5sums=('7c04c678d4ecd9e9c06747e7c17e0bb9'
-         '0658c31a909beba3e73e503060df5fba'
-         '2fafec93d1dc9da0797095b815a60d88'
-         '621a2b82623d5514be88d15700e9eb20'
-         '9e4577ed83ed53a7758f4bfbb5ddbe98')
+        "0001-Support-pkg-config-under-Android.patch"
+        "0002-Use-pkg-config-to-find-external-libraries.patch")
+md5sums=('e7ea948ab99a2ef0726db5eac8e4fd8e'
+         '6af9dcc450ae6c69d8fddccf0680d84a'
+         'f0f5dda8352a675566a08fa0f863a08b')
 
 prepare() {
     cd ${_pkgfqn}
@@ -79,22 +77,10 @@ prepare() {
     check_ndk_version_ge_than 18.0
     check_android_platform
 
-    # Platform specific patches.
-
-    patch -Np1 -i "../0001-Fix-clang-libc-build-under-Android.patch"
-
-    # Skip building mapboxgl as it increases compile time significantly and
-    # likely not a lot of people actually using it; if you need it, just remove the
-    # following line:
-    patch -Np1 -i "../0002-Disable-mapboxgl.patch"
+    patch -Np1 -i "../0001-Support-pkg-config-under-Android.patch"
+    patch -Np1 -i "../0002-Use-pkg-config-to-find-external-libraries.patch"
 
-    patch -Np1 -i "../0003-Support-pkg-config-under-Android.patch"
-    patch -Np1 -i "../0004-Use-pkg-config-to-find-libjpeg.patch"
-
-    sed -i "s/android-16/android-$ANDROID_MINIMUM_PLATFORM/g" qtbase/mkspecs/features/android/sdk.prf
-    sed -i "s/android-16/android-$ANDROID_MINIMUM_PLATFORM/g" qtbase/src/android/jar/jar.pro
-    sed -i "s/android-16/android-$ANDROID_MINIMUM_PLATFORM/g" qtgamepad/src/plugins/gamepads/android/jar/jar.pro
-    sed -i "s/android-16/android-$ANDROID_MINIMUM_PLATFORM/g" qtbase/configure.pri
+    sed -i "s/android-21/android-$ANDROID_MINIMUM_PLATFORM/g" qtbase/configure.pri
 }
 
 build() {
@@ -112,6 +98,7 @@ build() {
     unset CARCH
     export PKG_CONFIG=$ANDROID_PKGCONFIG
     export PYTHON=/usr/bin/python2
+    export ANDROID_TARGET_ARCH="${ANDROID_ABI}"
 
     configue_opts="
         -confirm-license
@@ -123,20 +110,23 @@ build() {
         -xplatform android-clang
         -nomake tests
         -nomake examples
-        -android-sdk ${ANDROID_HOME}
-        -android-ndk ${ANDROID_NDK_HOME}
-        -android-ndk-host linux-x86_64
-        -android-toolchain-version 4.9
         -skip qtserialport
+        -skip qtwebengine
         -no-warnings-are-errors
         -pkg-config
-        -pkg-config
-        -system-zlib
-        -system-libpng
         -system-libjpeg
+        -system-libpng
+        -system-tiff
+        -system-webp
+        -system-zlib
+        -no-feature-geoservices_mapbox
+        -no-feature-geoservices_mapboxgl
         -openssl-runtime
         -qt-freetype
-        -android-arch ${ANDROID_ABI}
+        -android-sdk ${ANDROID_HOME}
+        -android-ndk ${ANDROID_NDK_HOME}
+        -android-ndk-host linux-x86_64
+        -android-abis ${ANDROID_ABI}
         -android-ndk-platform ${ANDROID_NDK_PLATFORM}
         -recheck-all
         -optimized-qmake
@@ -167,6 +157,7 @@ package() {
 
     make INSTALL_ROOT=${pkgdir} install
 
+    rm -rvf ${pkgdir}/libs
     find ${pkgdir}/${ANDROID_PREFIX_BIN} -type f ! -name '*.pl' -exec strip -s {} \;
     find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f -name 'lib*.so' -exec ${ANDROID_STRIP} -g --strip-unneeded {} \;
 #    find ${pkgdir}/${ANDROID_PREFIX_LIB} -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} -g {} \;