Updated to Qt 5.15.1.

3 files changed, 30 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8fcb938d56ad..73a7fb678026 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = android-x86-qt5
 	pkgdesc = Qt 5 for Android
-	pkgver = 5.15.0
+	pkgver = 5.15.1
 	pkgrel = 1
 	url = https://www.qt.io
 	install = android-x86-qt5.install
@@ -38,12 +38,14 @@ pkgbase = android-x86-qt5
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = http://download.qt-project.org/official_releases/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz
+	source = http://download.qt-project.org/official_releases/qt/5.15/5.15.1/single/qt-everywhere-src-5.15.1.tar.xz
 	source = 0001-Support-pkg-config-under-Android.patch
 	source = 0002-Force-64-bit-atomics-usage.patch
-	md5sums = 610a228dba6ef469d14d145b71ab3b88
+	source = 0003-Remove-undeclared-method-in-QtNative.patch
+	md5sums = ab16c28f4f9e6db8299096312decdbc4
 	md5sums = 6af9dcc450ae6c69d8fddccf0680d84a
 	md5sums = f17efcb3d46afefd9d2c011301fd53c5
+	md5sums = b5e5c0d979b0f6a4dd90f32ce999965b
 
 pkgname = android-x86-qt5
 
diff --git a/0003-Remove-undeclared-method-in-QtNative.patch b/0003-Remove-undeclared-method-in-QtNative.patch
new file mode 100644
index 000000000000..e67823b1f72c
--- /dev/null
+++ b/0003-Remove-undeclared-method-in-QtNative.patch
@@ -0,0 +1,11 @@
+--- a/qtbase/src/android/jar/src/org/qtproject/qt5/android/QtNative.java	2020-09-02 07:15:07.000000000 -0300
++++ b/qtbase/src/android/jar/src/org/qtproject/qt5/android/QtNative.java	2020-09-21 11:51:56.726695150 -0300
+@@ -949,8 +949,6 @@
+
+     private static void clearClipData()
+     {
+-        if (Build.VERSION.SDK_INT >= 28 && m_clipboardManager != null && m_usePrimaryClip)
+-            m_clipboardManager.clearPrimaryClip();
+         m_usePrimaryClip = false;
+     }
+     private static void setClipboardText(String text)
diff --git a/PKGBUILD b/PKGBUILD
index b97bae47da23..e862aaea3304 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 _android_arch=x86
 
 pkgname=android-${_android_arch}-qt5
-pkgver=5.15.0
+pkgver=5.15.1
 pkgrel=1
 pkgdesc="Qt 5 for Android"
 arch=('any')
@@ -65,10 +65,12 @@ _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-Support-pkg-config-under-Android.patch"
-        "0002-Force-64-bit-atomics-usage.patch")
-md5sums=('610a228dba6ef469d14d145b71ab3b88'
+        "0002-Force-64-bit-atomics-usage.patch"
+        "0003-Remove-undeclared-method-in-QtNative.patch")
+md5sums=('ab16c28f4f9e6db8299096312decdbc4'
          '6af9dcc450ae6c69d8fddccf0680d84a'
-         'f17efcb3d46afefd9d2c011301fd53c5')
+         'f17efcb3d46afefd9d2c011301fd53c5'
+         'b5e5c0d979b0f6a4dd90f32ce999965b')
 
 prepare() {
     cd ${_pkgfqn}
@@ -87,6 +89,7 @@ prepare() {
             ;;
     esac
 
+    patch -Np1 -i "../0003-Remove-undeclared-method-in-QtNative.patch"
     sed -i "s/android-21/android-$ANDROID_MINIMUM_PLATFORM/g" qtbase/configure.pri
 }
 
@@ -146,11 +149,17 @@ build() {
 
     # Platform specific patches
     case "$_android_arch" in
-        x86*)
+        x86)
              configue_opts+="
                  -no-sql-mysql
                  -no-sql-psql"
             ;;
+        x86-64)
+             configue_opts+="
+                 -no-avx2
+                 -no-sql-mysql
+                 -no-sql-psql"
+            ;;
         *)
             ;;
     esac