Package updated.

3 files changed, 51 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd2acaa484f4..0e96c3f93298 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# mié abr 24 21:54:48 UTC 2019
 pkgbase = android-x86-qt5
 	pkgdesc = Qt 5 for Android
 	pkgver = 5.12.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.qt.io
 	install = android-x86-qt5.install
 	arch = any
@@ -36,7 +34,7 @@ pkgbase = android-x86-qt5
 	source = 0001-Fix-clang-build.patch
 	source = 0002-Disable-mapbox.patch
 	md5sums = 38017e0ed88b9baba063bd723d9ca8b2
-	md5sums = 0b19ddef193baddb656d3170635e6de6
+	md5sums = 6bba1ddffbf1d3ce0c4887ce8b8b1fc4
 	md5sums = 20d8bdd24102e9011b561b7361394728
 
 pkgname = android-x86-qt5
diff --git a/0001-Fix-clang-build.patch b/0001-Fix-clang-build.patch
index 4c2431370153..fb05b3f3811a 100644
--- a/0001-Fix-clang-build.patch
+++ b/0001-Fix-clang-build.patch
@@ -1,24 +1,60 @@
---- a/qtbase/mkspecs/android-clang/qmake.conf	2019-02-07 11:03:08.250521061 -0300
-+++ b/qtbase/mkspecs/android-clang/qmake.conf	2019-02-07 11:10:50.389466359 -0300
-@@ -34,11 +34,12 @@
+--- 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,30 +15,26 @@
+ 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-", "")
+ else: equals(ANDROID_TARGET_ARCH, mips): \
+-    QMAKE_CFLAGS += -target mipsel-none-linux-android
++    QMAKE_CFLAGS += -target mipsel-linux-android$$replace(ANDROID_PLATFORM, "android-", "")
+ else: equals(ANDROID_TARGET_ARCH, mips64): \
+-    QMAKE_CFLAGS += -target mips64el-none-linux-android
++    QMAKE_CFLAGS += -target mips64el-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 \
-+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/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
++QMAKE_CFLAGS += -DANDROID_HAS_WSTRING
 
  ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH
 
-@@ -54,3 +54,6 @@
+@@ -54,3 +50,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            =
+ QMAKE_LFLAGS_APP        = -Wl,--no-undefined -Wl,-z,noexecstack -shared
+ QMAKE_LFLAGS_SHLIB      = -Wl,--no-undefined -Wl,-z,noexecstack -shared
+ QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
diff --git a/PKGBUILD b/PKGBUILD
index ef95f5036c05..d058213269c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ source android-env.sh ${_android_arch}
 
 pkgname=android-${_android_arch}-qt5
 pkgver=5.12.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Qt 5 for Android"
 arch=('any')
 url='https://www.qt.io'
@@ -47,7 +47,7 @@ case "$_android_arch" in
                     "android-x86-system-image: AVD support")
         ;;
     x86-64)
-        optdepends=("android-google-apis-x86-64: AVD support"
+        SKIPoptdepends=("android-google-apis-x86-64: AVD support"
                     "android-x86-64-system-image: AVD support")
         ;;
     *)
@@ -61,7 +61,7 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg
         "0001-Fix-clang-build.patch"
         "0002-Disable-mapbox.patch")
 md5sums=('38017e0ed88b9baba063bd723d9ca8b2'
-         '0b19ddef193baddb656d3170635e6de6'
+         '6bba1ddffbf1d3ce0c4887ce8b8b1fc4'
          '20d8bdd24102e9011b561b7361394728')
 
 prepare() {