Updated to Qt 5.13.1.

8 files changed, 182 insertions, 117 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4411854df89e..3af639d4f428 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,41 +1,50 @@
 pkgbase = android-x86-64-qt5
 	pkgdesc = Qt 5 for Android
-	pkgver = 5.13.0
-	pkgrel = 2
+	pkgver = 5.13.1
+	pkgrel = 1
 	url = https://www.qt.io
 	install = android-x86-64-qt5.install
 	arch = any
 	groups = android-qt5
 	license = GPL3
 	license = LGPL
-	makedepends = android-environment
 	makedepends = libgl
 	makedepends = sqlite
 	makedepends = zlib
 	makedepends = python2
+	makedepends = python
 	makedepends = ruby
 	makedepends = gperf
 	makedepends = libxslt
 	makedepends = fontconfig
+	makedepends = java-environment-openjdk<=8
+	makedepends = android-environment
+	makedepends = android-pkg-config
 	depends = java-runtime-headless-openjdk<=8
 	depends = apache-ant
-	depends = android-pkg-config
 	depends = android-ndk
 	depends = android-sdk
 	depends = android-sdk-build-tools
 	depends = android-sdk-platform-tools
+	depends = android-x86-64-zlib
+	depends = android-x86-64-libpng
+	depends = android-x86-64-libjpeg-turbo
 	optdepends = android-google-apis-x86-64: AVD support
 	optdepends = android-x86-64-system-image: AVD support
 	options = !strip
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = http://download.qt-project.org/official_releases/qt/5.13/5.13.0/single/qt-everywhere-src-5.13.0.tar.xz
-	source = 0001-Fix-clang-build.patch
-	source = 0002-Disable-mapbox.patch
-	md5sums = 3c168d9a3a08248ff36f4f54c82e437f
-	md5sums = SKIP
-	md5sums = SKIP
+	source = http://download.qt-project.org/official_releases/qt/5.13/5.13.1/single/qt-everywhere-src-5.13.1.tar.xz
+	source = 0001-Fix-clang-libc-build-under-Android.patch
+	source = 0002-Disable-mapboxgl.patch
+	source = 0003-Support-pkg-config-under-Android.patch
+	source = 0004-Use-pkg-config-to-find-libjpeg.patch
+	md5sums = d66b1da335d0c25325fdf493e9044c38
+	md5sums = 0658c31a909beba3e73e503060df5fba
+	md5sums = 2fafec93d1dc9da0797095b815a60d88
+	md5sums = 621a2b82623d5514be88d15700e9eb20
+	md5sums = 9e4577ed83ed53a7758f4bfbb5ddbe98
 
 pkgname = android-x86-64-qt5
 
diff --git a/0001-Fix-clang-build.patch b/0001-Fix-clang-build.patch
deleted file mode 100644
index aa83bd5b0052..000000000000
--- a/0001-Fix-clang-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/qtbase/mkspecs/android-clang/qmake.conf	2019-04-09 06:51:26.000000000 -0300
-+++ b/qtbase/mkspecs/android-clang/qmake.conf	2019-06-10 15:27:30.837639900 -0300
-@@ -15,26 +15,22 @@
- QMAKE_CXX     = $$NDK_LLVM_PATH/bin/clang++
-
- equals(ANDROID_TARGET_ARCH, armeabi-v7a): \
--    QMAKE_CFLAGS += -target armv7-none-linux-androideabi
-+    QMAKE_CFLAGS += -target armv7-linux-androideabi$$replace(ANDROID_PLATFORM, "android-", "")
- else: equals(ANDROID_TARGET_ARCH, armeabi): \
--    QMAKE_CFLAGS += -target armv5te-none-linux-androideabi
-+    QMAKE_CFLAGS += -target armv5te-linux-androideabi$$replace(ANDROID_PLATFORM, "android-", "")
- else: equals(ANDROID_TARGET_ARCH, arm64-v8a): \
--    QMAKE_CFLAGS += -target aarch64-none-linux-android
-+    QMAKE_CFLAGS += -target aarch64-linux-android$$replace(ANDROID_PLATFORM, "android-", "")
- else: equals(ANDROID_TARGET_ARCH, x86): \
--    QMAKE_CFLAGS += -target i686-none-linux-android -mstackrealign
-+    QMAKE_CFLAGS += -target i686-linux-android$$replace(ANDROID_PLATFORM, "android-", "") -mstackrealign
- else: equals(ANDROID_TARGET_ARCH, x86_64): \
--    QMAKE_CFLAGS += -target x86_64-none-linux-android
-+    QMAKE_CFLAGS += -target x86_64-linux-android$$replace(ANDROID_PLATFORM, "android-", "")
-
- 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
-
--QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \
--                -isystem $$NDK_ROOT/sysroot/usr/include/$$NDK_TOOLS_PREFIX \
--                -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++/include \
--                -isystem $$NDK_ROOT/sources/android/support/include \
--                -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++abi/include
-+QMAKE_CFLAGS += -DANDROID_HAS_WSTRING
-
- ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH
-
-@@ -50,3 +46,6 @@
- QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
-
- include(../common/android-base-tail.conf)
-+
-+QMAKE_PKG_CONFIG = $$[QT_INSTALL_PREFIX]
-+QMAKE_PKG_CONFIG = android-$$section(QMAKE_PKG_CONFIG, /, 3, 3)-pkg-config
-
---- a/qtbase/mkspecs/common/android-base-tail.conf	2019-04-09 06:51:26.000000000 -0300
-+++ b/qtbase/mkspecs/common/android-base-tail.conf	2019-06-10 15:45:27.869082761 -0300
-@@ -68,7 +68,7 @@
- QMAKE_LIBDIR_OPENGL     =
-
- QMAKE_LINK_SHLIB        = $$QMAKE_LINK
--QMAKE_LFLAGS            = --sysroot=$$ANDROID_PLATFORM_ROOT_PATH
-+QMAKE_LFLAGS            =
- equals(ANDROID_TARGET_ARCH, x86_64) QMAKE_LFLAGS += -L$$ANDROID_PLATFORM_ROOT_PATH/usr/lib64
- QMAKE_LFLAGS_APP        = -Wl,--no-undefined -Wl,-z,noexecstack -shared
- QMAKE_LFLAGS_SHLIB      = -Wl,--no-undefined -Wl,-z,noexecstack -shared
diff --git a/0001-Fix-clang-libc-build-under-Android.patch b/0001-Fix-clang-libc-build-under-Android.patch
new file mode 100644
index 000000000000..dd9f84326a97
--- /dev/null
+++ b/0001-Fix-clang-libc-build-under-Android.patch
@@ -0,0 +1,40 @@
+From 2c8ca36b5f87ccfc039c0b669c80f21205769758 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 9 Dec 2018 14:28:07 +0100
+Subject: [PATCH 1/4] Fix clang/libc++ build under Android
+
+---
+ qtbase/mkspecs/android-clang/qmake.conf | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/qtbase/mkspecs/android-clang/qmake.conf b/qtbase/mkspecs/android-clang/qmake.conf
+index 05b7979142..83d030793b 100644
+--- a/qtbase/mkspecs/android-clang/qmake.conf
++++ b/qtbase/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 -nostdlib++
+ equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a
+
+-QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \
++QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \
+                 -isystem $$NDK_ROOT/sysroot/usr/include/$$NDK_TOOLS_PREFIX \
+                 -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++/include \
+                 -isystem $$NDK_ROOT/sources/android/support/include \
+-                -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++abi/include
++                -isystem $$NDK_ROOT/sources/cxx-stl/llvm-libc++abi/include \
++                -isystem $$NDK_ROOT/sysroot/usr/include
+
+ ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH
+
+@@ -44,6 +45,8 @@ ANDROID_USE_LLVM = true
+
+ exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so): \
+     ANDROID_CXX_STL_LIBS = -lc++
++else: exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++_shared.so): \
++    ANDROID_CXX_STL_LIBS = -lc++_shared
+ else: \
+     ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "")
+
+--
+2.23.0
+
diff --git a/0002-Disable-mapbox.patch b/0002-Disable-mapbox.patch
deleted file mode 100644
index 2266f773a475..000000000000
--- a/0002-Disable-mapbox.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/qtlocation/src/plugins/geoservices/geoservices.pro	2018-08-31 09:50:06.000000000 -0300
-+++ b/qtlocation/src/plugins/geoservices/geoservices.pro	2018-09-29 09:32:24.465419357 -0300
-@@ -7,12 +7,3 @@
- qtConfig(geoservices_esri): SUBDIRS += esri
- qtConfig(geoservices_itemsoverlay): SUBDIRS += itemsoverlay
- qtConfig(geoservices_osm): SUBDIRS += osm
--
--qtConfig(geoservices_mapboxgl) {
--    !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) {
--        warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
--    } else {
--        SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native
--        mapboxgl.depends = ../../3rdparty/mapbox-gl-native
--    }
--}
diff --git a/0002-Disable-mapboxgl.patch b/0002-Disable-mapboxgl.patch
new file mode 100644
index 000000000000..495b1b08644f
--- /dev/null
+++ b/0002-Disable-mapboxgl.patch
@@ -0,0 +1,29 @@
+From dbe68d96e7da8ba5e5484e6ad0bbd78c9b0a8eec Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 9 Dec 2018 14:29:59 +0100
+Subject: [PATCH] Disable mapboxgl
+
+---
+ qtlocation/src/plugins/geoservices/geoservices.pro | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/qtlocation/src/plugins/geoservices/geoservices.pro b/qtlocation/src/plugins/geoservices/geoservices.pro
+index b81ad34a..98308c97 100644
+--- a/qtlocation/src/plugins/geoservices/geoservices.pro
++++ b/qtlocation/src/plugins/geoservices/geoservices.pro
+@@ -7,12 +7,3 @@ qtConfig(geoservices_mapbox): SUBDIRS += mapbox
+ qtConfig(geoservices_esri): SUBDIRS += esri
+ qtConfig(geoservices_itemsoverlay): SUBDIRS += itemsoverlay
+ qtConfig(geoservices_osm): SUBDIRS += osm
+-
+-qtConfig(geoservices_mapboxgl) {
+-    !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) {
+-        warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
+-    } else {
+-        SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native
+-        mapboxgl.depends = ../../3rdparty/mapbox-gl-native
+-    }
+-}
+--
+2.23.0
+
diff --git a/0003-Support-pkg-config-under-Android.patch b/0003-Support-pkg-config-under-Android.patch
new file mode 100644
index 000000000000..290418d9941f
--- /dev/null
+++ b/0003-Support-pkg-config-under-Android.patch
@@ -0,0 +1,24 @@
+From a71a1223328539ee403884a24d1dbc5a685d40dd Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sun, 7 Apr 2019 09:54:49 +0200
+Subject: [PATCH 3/4] Support pkg-config under Android
+
+from https://aur.archlinux.org/cgit/aur.git/commit/?h=android-aarch64-qt5&id=d901da324b2ceea2ac99b48137cb82b2bd920c77
+---
+ qtbase/mkspecs/android-clang/qmake.conf | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/qtbase/mkspecs/android-clang/qmake.conf b/qtbase/mkspecs/android-clang/qmake.conf
+index 83d030793b..8f145a2bb7 100644
+--- a/qtbase/mkspecs/android-clang/qmake.conf
++++ b/qtbase/mkspecs/android-clang/qmake.conf
+@@ -53,3 +53,6 @@ else: \
+ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
+
+ include(../common/android-base-tail.conf)
++
++QMAKE_PKG_CONFIG = $$[QT_INSTALL_PREFIX]
++QMAKE_PKG_CONFIG = android-$$section(QMAKE_PKG_CONFIG, /, 3, 3)-pkg-config
+--
+2.23.0
+
diff --git a/0004-Use-pkg-config-to-find-libjpeg.patch b/0004-Use-pkg-config-to-find-libjpeg.patch
new file mode 100644
index 000000000000..9292b8b1a951
--- /dev/null
+++ b/0004-Use-pkg-config-to-find-libjpeg.patch
@@ -0,0 +1,24 @@
+From 9cd435c730949e29104bbfa2bdd82ed2c662ca3d Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 7 Sep 2019 13:21:37 +0200
+Subject: [PATCH 4/4] Use pkg-config to find libjpeg
+
+---
+ qtbase/src/gui/configure.json | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qtbase/src/gui/configure.json b/qtbase/src/gui/configure.json
+index 6280b4dfa2..206f83984a 100644
+--- a/qtbase/src/gui/configure.json
++++ b/qtbase/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/PKGBUILD b/PKGBUILD
index 89ee6b42ace6..c0634fc81d62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,28 +7,33 @@
 _android_arch=x86-64
 
 pkgname=android-${_android_arch}-qt5
-pkgver=5.13.0
-pkgrel=2
+pkgver=5.13.1
+pkgrel=1
 pkgdesc="Qt 5 for Android"
 arch=('any')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL')
-makedepends=('android-environment'
-             'libgl'
+makedepends=('libgl'
              'sqlite'
              'zlib'
              'python2'
+             'python' # Qt Qml requires Python 3
              'ruby'
              'gperf'
              'libxslt'
-             'fontconfig')
+             'fontconfig'
+             'java-environment-openjdk<=8'
+             'android-environment'
+             'android-pkg-config')
 depends=('java-runtime-headless-openjdk<=8'
-        'apache-ant'
-        'android-pkg-config'
-        'android-ndk'
-        'android-sdk'
-        'android-sdk-build-tools'
-        'android-sdk-platform-tools')
+         'apache-ant'
+         'android-ndk'
+         'android-sdk'
+         'android-sdk-build-tools'
+         'android-sdk-platform-tools'
+         "android-${_android_arch}-zlib"
+         "android-${_android_arch}-libpng"
+         "android-${_android_arch}-libjpeg-turbo")
 groups=('android-qt5')
 
 case "$_android_arch" in
@@ -56,11 +61,15 @@ 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-build.patch"
-        "0002-Disable-mapbox.patch")
-md5sums=('3c168d9a3a08248ff36f4f54c82e437f'
-         'SKIP'
-         'SKIP')
+        "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=('d66b1da335d0c25325fdf493e9044c38'
+         '0658c31a909beba3e73e503060df5fba'
+         '2fafec93d1dc9da0797095b815a60d88'
+         '621a2b82623d5514be88d15700e9eb20'
+         '9e4577ed83ed53a7758f4bfbb5ddbe98')
 
 prepare() {
     cd ${_pkgfqn}
@@ -71,8 +80,16 @@ prepare() {
 
     # Platform specific patches.
 
-    patch -Np1 -i "../0001-Fix-clang-build.patch"
-    patch -Np1 -i "../0002-Disable-mapbox.patch"
+    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 "../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
@@ -95,21 +112,6 @@ build() {
     export PKG_CONFIG=$ANDROID_PKGCONFIG
     export PYTHON=/usr/bin/python2
 
-    case "$_android_arch" in
-        aarch64)
-            target_arch=arm64-v8a
-            ;;
-        armv7a-eabi)
-            target_arch=armeabi-v7a
-            ;;
-        x86)
-            target_arch=x86
-            ;;
-        x86-64)
-            target_arch=x86_64
-            ;;
-    esac
-
     configue_opts="
         -confirm-license
         -opensource
@@ -124,16 +126,21 @@ build() {
         -android-ndk ${ANDROID_NDK_HOME}
         -android-ndk-host linux-x86_64
         -android-toolchain-version 4.9
-        -skip qttranslations
         -skip qtserialport
         -no-warnings-are-errors
         -pkg-config
-        -qt-zlib
+        -pkg-config
+        -system-zlib
+        -system-libpng
+        -system-libjpeg
         -qt-freetype
-        -android-arch ${target_arch}
-        -android-ndk-platform ${ANDROID_NDK_PLATFORM}"
+        -android-arch ${ANDROID_ABI}
+        -android-ndk-platform ${ANDROID_NDK_PLATFORM}
+        -recheck-all
+        -optimized-qmake
+        -I${ANDROID_PREFIX}/include"
 
-    [[ $ANDROID_DEBUG_BUILD ]] \
+    [[ $QT_ANDROID_DEBUG_BUILD ]] \
         && configue_opts+=' -debug-and-release' \
         || configue_opts+=' -release'
 
@@ -157,6 +164,7 @@ package() {
     source android-env ${_android_arch}
 
     make INSTALL_ROOT=${pkgdir} install
+
     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 {} \;