Update to 5.7.0

3 files changed, 20 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 822a9ed78eb9..c1371b51cc32 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 # Generated by mksrcinfo v8
-# Thu Jun 16 08:00:30 UTC 2016
+# Wed Jun 22 18:35:58 UTC 2016
 pkgbase = mingw-w64-qt5-declarative
 	pkgdesc = Classes for QML and JavaScript languages (mingw-w64)
-	pkgver = 5.6.1
+	pkgver = 5.7.0
 	pkgrel = 1
 	url = https://www.qt.io/
-	arch = any
+	arch = i686
+	arch = x86_64
 	groups = mingw-w64-qt
 	groups = mingw-w64-qt5
 	license = custom, FDL, GPL3, LGPL
@@ -15,10 +16,10 @@ pkgbase = mingw-w64-qt5-declarative
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-opensource-src-5.6.1.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.7/5.7.0/submodules/qtdeclarative-opensource-src-5.7.0.tar.xz
 	source = qt5-build-qmldevtools-as-shared-library.patch
-	md5sums = ea2a2602b8a91f2618a36be09bcd79e9
-	md5sums = 6c445ba7713b69d90f52bb2242303853
+	md5sums = 0d9e461aa54dba4793253fa2eb501f9b
+	md5sums = 8f90ec8c2379b85de0b04847865b230c
 
 pkgname = mingw-w64-qt5-declarative
 
diff --git a/PKGBUILD b/PKGBUILD
index a88823a2793e..15dc189ad265 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,9 @@
 
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.6.1
+pkgver=5.7.0
 pkgrel=1
-arch=('any')
+arch=('i686' 'x86_64')
 pkgdesc="Classes for QML and JavaScript languages (mingw-w64)"
 depends=(mingw-w64-qt5-base)
 makedepends=(mingw-w64-gcc python)
@@ -20,8 +20,8 @@ url="https://www.qt.io/"
 _pkgfqn="${_qt_module}-opensource-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         "qt5-build-qmldevtools-as-shared-library.patch")
-md5sums=('ea2a2602b8a91f2618a36be09bcd79e9'
-         '6c445ba7713b69d90f52bb2242303853')
+md5sums=('0d9e461aa54dba4793253fa2eb501f9b'
+         '8f90ec8c2379b85de0b04847865b230c')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -36,12 +36,13 @@ build() {
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-qmake-qt5 ../${_qt_module}.pro
 
-    # Something is messed up with Qt5Bootstrap
+    # search paths for host standard library (/usr/lib) and for Qt5Bootstrap (/usr/$_arch/lib) are not set correctly by qmake
+    # hence we need insert those paths manually
     make qmake_all
-    find ./src -type f -exec sed -i "s|-L/usr/${_arch}/lib -lQt5Bootstrap|/usr/lib/libstdc++.so.6 /usr/lib/libm.so -L/usr/${_arch}/lib -lQt5Bootstrap|g" {} \;
-    find . -type f -exec sed -i "s|-L/usr/${_arch}/lib -lQt5Bootstrap|/usr/lib/libstdc++.so.6 /usr/lib/libm.so -L/usr/${_arch}/lib -lQt5Bootstrap|g" {} \;
-    find ./src -type f -exec sed -i "s|-L/usr/${_arch}/lib -lQt5QmlDevTools|/usr/lib/libstdc++.so.6 -L/usr/${_arch}/lib -lQt5QmlDevTools|g" {} \;
-    find ./tools -type f -exec sed -i "s|-L/usr/${_arch}/lib -lQt5Bootstrap|/usr/lib/libstdc++.so.6 /usr/lib/libm.so -L/usr/${_arch}/lib -lQt5Bootstrap|g" {} \;
+    find ./src/qmldevtools -type f -iname 'Makefile' -exec sed -i "s|-lQt5Bootstrap|-L/usr/lib -L/usr/$_arch/lib -lQt5Bootstrap|g" {} \;
+    find . -type f -iname 'Makefile' -exec sed -i "s|-L$PWD/lib -lQt5Bootstrap|-L/usr/lib -L$PWD/lib -L/usr/$_arch/lib -lQt5Bootstrap|g" {} \;
+    find . -type f -iname 'Makefile' -exec sed -i "s|-L$PWD/lib -lQt5QmlDevTools -lQt5Bootstrap|-L/usr/lib -L$PWD/lib -L/usr/$_arch/lib -lQt5QmlDevTools -lQt5Bootstrap|g" {} \;
+
     make
     popd
   done
@@ -58,6 +59,8 @@ package() {
     find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm
     find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
     find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g
+    strip --strip-all "${pkgdir}/usr/${_arch}/lib/qt/bin/"*
+    strip --strip-unneeded "${pkgdir}/usr/${_arch}/lib/"*.so.$pkgver
     popd
   done
 }
diff --git a/qt5-build-qmldevtools-as-shared-library.patch b/qt5-build-qmldevtools-as-shared-library.patch
index f8a120f5457b..a3910e9a526c 100644
--- a/qt5-build-qmldevtools-as-shared-library.patch
+++ b/qt5-build-qmldevtools-as-shared-library.patch
@@ -3,7 +3,7 @@
 @@ -1,7 +1,7 @@
  option(host_build)
  TARGET     = QtQmlDevTools
- QT         = core
+ QT         = core-private
 -CONFIG += static internal_module qmldevtools_build
 +CONFIG += internal_module qmldevtools_build