Updated to Qt 5.6.0.

4 files changed, 86 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de207a8e99ca..a98102c86374 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# sáb mar 12 02:12:20 UTC 2016
+# lun mar 21 03:00:29 UTC 2016
 pkgbase = android-qt5-x86
 	pkgdesc = Qt 5 for Android
-	pkgver = 5.5.1
-	pkgrel = 2
+	pkgver = 5.6.0
+	pkgrel = 1
 	url = https://www.qt.io
 	arch = i686
 	arch = x86_64
@@ -28,14 +28,18 @@ pkgbase = android-qt5-x86
 	optdepends = android-google-apis-x86: AVD support
 	optdepends = android-x86-system-image: AVD support
 	conflicts = qt-android
-	source = http://download.qt-project.org/official_releases/qt/5.5/5.5.1/single/qt-everywhere-opensource-src-5.5.1.tar.xz
+	source = http://download.qt-project.org/official_releases/qt/5.6/5.6.0/single/qt-everywhere-opensource-src-5.6.0.tar.xz
 	source = qglobal.h.patch
 	source = Misc.cpp.patch
 	source = JavaScriptCore.pri.patch
-	sha256sums = 6f028e63d4992be2b4a5526f2ef3bfa2fe28c5c757554b11d9e8d86189652518
+	source = imageformats.pro.patch
+	source = src.pro.patch
+	sha256sums = 76a95cf6c1503290f75a641aa25079cd0c5a8fcd7cff07ddebff80a955b07de7
 	sha256sums = fc735eda1209661f78067ea5649c9ceceeb7e49804d5de5975c4e5fbfbf34d7e
 	sha256sums = 096eef8234f0ea964ac20ca887c8da2e7b5b836de417515acde103c2a27a04de
 	sha256sums = 133dad6c8d0bedaa5d561be26b2f7185e671900c50d11476ecb2e2ef6792d455
+	sha256sums = 943e8c03dc2218250f75cec3b663d90e6bb98d9b64b9f12b01713c284e5e4673
+	sha256sums = 1e0bda5274a17a0aea431e53adf737beab8552b7a0ff70d478ba07004ffbdcf8
 
 pkgname = android-qt5-x86
 
diff --git a/PKGBUILD b/PKGBUILD
index 4cce5e5c5ce6..df8c3597ccbb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,9 @@
 android_arch=x86
 _pkgname=android-qt5
 pkgname=${_pkgname}-${android_arch}
-pkgver=5.5.1
-_pkgver=5.5
-pkgrel=2
+_pkgver=5.6
+pkgver=${_pkgver}.0
+pkgrel=1
 pkgdesc="Qt 5 for Android"
 arch=('i686' 'x86_64')
 url='https://www.qt.io'
@@ -55,17 +55,29 @@ _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/${_pkgver}/${pkgver}/single/${_pkgfqn}.tar.xz"
         "qglobal.h.patch"
         "Misc.cpp.patch"
-        "JavaScriptCore.pri.patch")
-sha256sums=('6f028e63d4992be2b4a5526f2ef3bfa2fe28c5c757554b11d9e8d86189652518'
+        "JavaScriptCore.pri.patch"
+        "imageformats.pro.patch"
+        "src.pro.patch")
+sha256sums=('76a95cf6c1503290f75a641aa25079cd0c5a8fcd7cff07ddebff80a955b07de7'
             'fc735eda1209661f78067ea5649c9ceceeb7e49804d5de5975c4e5fbfbf34d7e'
             '096eef8234f0ea964ac20ca887c8da2e7b5b836de417515acde103c2a27a04de'
-            '133dad6c8d0bedaa5d561be26b2f7185e671900c50d11476ecb2e2ef6792d455')
+            '133dad6c8d0bedaa5d561be26b2f7185e671900c50d11476ecb2e2ef6792d455'
+            '943e8c03dc2218250f75cec3b663d90e6bb98d9b64b9f12b01713c284e5e4673'
+            '1e0bda5274a17a0aea431e53adf737beab8552b7a0ff70d478ba07004ffbdcf8')
 
 prepare() {
     cd ${_pkgfqn}
-    patch -Np1 -i "../qglobal.h.patch"
-    patch -Np1 -i "../Misc.cpp.patch"
-    patch -Np1 -i "../JavaScriptCore.pri.patch"
+
+    # Platform specific patches
+    case "$android_arch"  in
+        *)
+#            patch -Np1 -i "../qglobal.h.patch"
+            patch -Np1 -i "../Misc.cpp.patch"
+            patch -Np1 -i "../JavaScriptCore.pri.patch"
+            patch -Np1 -i "../imageformats.pro.patch"
+            patch -Np1 -i "../src.pro.patch"
+            ;;
+    esac
 }
 
 build() {
@@ -95,26 +107,38 @@ build() {
 
     _pref=/opt/${_pkgname}/${pkgver}/${android_arch}
 
-    ./configure -confirm-license -opensource \
-        -prefix ${_pref} \
-        -docdir ${_pref}/doc \
-        -xplatform android-g++ \
-        -nomake tests \
-        -nomake examples \
-        -android-ndk /opt/android-ndk \
-        -android-sdk /opt/android-sdk \
-        -android-ndk-host ${ndkhost} \
-        -android-toolchain-version 4.9 \
-        -skip qttranslations \
-        -skip qtwebkit \
-        -skip qtserialport \
-        -skip qtwebkit-examples \
-        -no-warnings-are-errors \
-        -qt-zlib \
-        -qt-freetype \
-        -no-sql-psql \
-        -android-arch ${android_arch} \
-        -android-ndk-platform android-21
+    configue_opts="
+        -confirm-license
+        -opensource
+        -prefix ${_pref}
+        -docdir ${_pref}/doc
+        -xplatform android-g++
+        -nomake tests
+        -nomake examples
+        -android-ndk /opt/android-ndk
+        -android-sdk /opt/android-sdk
+        -android-ndk-host ${ndkhost}
+        -android-toolchain-version 4.9
+        -skip qttranslations
+        -skip qtserialport
+        -no-warnings-are-errors
+        -no-pkg-config
+        -qt-zlib
+        -qt-freetype
+        -android-arch ${android_arch}
+        -android-ndk-platform android-24"
+
+    # Platform specific patches
+    case "$android_arch"  in
+        *)
+            configue_opts+="
+                -skip qt3d
+                -no-sql-psql
+                -no-sql-mysql"
+            ;;
+    esac
+
+    ./configure ${configue_opts}
 
     make || return 1
 }
diff --git a/imageformats.pro.patch b/imageformats.pro.patch
new file mode 100644
index 000000000000..4aa248da3462
--- /dev/null
+++ b/imageformats.pro.patch
@@ -0,0 +1,12 @@
+--- a/qtimageformats/src/plugins/imageformats/imageformats.pro	2016-02-02 09:12:49.000000000 -0300
++++ b/qtimageformats/src/plugins/imageformats/imageformats.pro	2016-03-19 18:23:51.538810498 -0300
+@@ -4,8 +4,7 @@
+     icns \
+     tga \
+     tiff \
+-    wbmp \
+-    webp
++    wbmp
+
+ config_jasper: SUBDIRS += jp2
+ config_libmng: SUBDIRS += mng
diff --git a/src.pro.patch b/src.pro.patch
new file mode 100644
index 000000000000..d3a37512542a
--- /dev/null
+++ b/src.pro.patch
@@ -0,0 +1,12 @@
+--- a/qttools/src/src.pro	2016-02-26 07:07:22.000000000 -0300
++++ b/qttools/src/src.pro	2016-03-20 09:13:46.576256622 -0300
+@@ -14,8 +14,7 @@
+ }
+
+ SUBDIRS += linguist \
+-    qdoc \
+-    qtplugininfo
++    qdoc
+ if(!android|android_app):!ios: SUBDIRS += qtpaths
+
+ mac {