Update to 5.10.1

5 files changed, 35 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed64e975590e..d2535172cb05 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Dec 14 00:06:22 UTC 2017
+# Mon Feb 19 19:15:12 UTC 2018
 pkgbase = mingw-w64-qt5-declarative
 	pkgdesc = Classes for QML and JavaScript languages (mingw-w64)
-	pkgver = 5.10.0
+	pkgver = 5.10.1
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = i686
@@ -21,14 +21,14 @@ pkgbase = mingw-w64-qt5-declarative
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.10/5.10.0/submodules/qtdeclarative-everywhere-src-5.10.0.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.10/5.10.1/submodules/qtdeclarative-everywhere-src-5.10.1.tar.xz
 	source = 0001-Build-QML-dev-tools-as-shared-library.patch
 	source = 0002-Ensure-static-plugins-are-exported.patch
 	source = 0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
-	sha256sums = 5ccb4dbca5046554037bcffbb05918f6efcff321c44cd1c39b1c47be7e67711e
-	sha256sums = 8923258b451a885b2300169864a43e944f951963455da1c79b5f06693323be7d
-	sha256sums = b9a5545eb33621deb61676e9000fc0417d0b1e419143bc276174c34545d6b562
-	sha256sums = df36a5b2a09c46b415d92e7aa1f9fe587ddd1fc58a4ccfb269661cd338414089
+	sha256sums = 3af9ed51bce5b5c6f04c4a67a6008f98765ccde897c43fff670621ab70789553
+	sha256sums = 777da4ec89376e654d9088ec70e3c5154dd8e31fa8de6f1f77f2d7d5f10bcd9b
+	sha256sums = e9afee84dfde3275807cc9b2eb1fb23b5074a12b8f896bd02d8b8f9963d545a6
+	sha256sums = cbf3675f3072bbab29fdf5541fd3c15986567a127f920cdaddcfff9e6a9d0283
 
 pkgname = mingw-w64-qt5-declarative
 
diff --git a/0001-Build-QML-dev-tools-as-shared-library.patch b/0001-Build-QML-dev-tools-as-shared-library.patch
index 958b9b35fd38..09eea8757353 100644
--- a/0001-Build-QML-dev-tools-as-shared-library.patch
+++ b/0001-Build-QML-dev-tools-as-shared-library.patch
@@ -1,4 +1,4 @@
-From cea3fc4942ec18a3d409bcabe4b57f80eec401be Mon Sep 17 00:00:00 2001
+From 3135dd89f17e198eab5b3739fd7fcd6b8d51a914 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:24:15 +0200
 Subject: [PATCH 1/3] Build QML dev tools as shared library
@@ -23,5 +23,5 @@ index a21988b91..fc5c4d05d 100644
  MODULE_INCNAME = QtQml
  
 -- 
-2.15.1
+2.16.1
 
diff --git a/0002-Ensure-static-plugins-are-exported.patch b/0002-Ensure-static-plugins-are-exported.patch
index dfc64b150884..519f1bcecb44 100644
--- a/0002-Ensure-static-plugins-are-exported.patch
+++ b/0002-Ensure-static-plugins-are-exported.patch
@@ -1,4 +1,4 @@
-From d4e3a5a7796274b3e3fdf083ebc4700c007bef83 Mon Sep 17 00:00:00 2001
+From 931571100b48c3c2d7cd797673f489531b0b45a2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 23 Oct 2016 01:18:13 +0200
 Subject: [PATCH 2/3] Ensure static plugins are exported
@@ -18,5 +18,5 @@ index 9ddb9885c..9775d85e0 100644
  foreach(_other_plugin ${_qt5qml_other_plugins})
      include(${_other_plugin} OPTIONAL)
 -- 
-2.15.1
+2.16.1
 
diff --git a/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
index d3c179b5d61c..daa22d30ab62 100644
--- a/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+++ b/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
@@ -1,4 +1,4 @@
-From 1752086b718718c0b7364bb72245c4bb9b1aeba5 Mon Sep 17 00:00:00 2001
+From 0cf5e799203f61ebdac79b68d7ab185aa506917b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 4 Feb 2017 01:59:59 +0100
 Subject: [PATCH 3/3] Prevent exporting QML parser symbols on static build
@@ -33,5 +33,5 @@ index 0e195994b..8aa451e9d 100644
  #      define QML_PARSER_EXPORT
  #    elif defined(QT_BUILD_QML_LIB)
 -- 
-2.15.1
+2.16.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 6a4098e33138..818011be0f5a 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
 
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.10.0
+pkgver=5.10.1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
@@ -27,10 +27,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '0001-Build-QML-dev-tools-as-shared-library.patch'
         '0002-Ensure-static-plugins-are-exported.patch'
         '0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch')
-sha256sums=('5ccb4dbca5046554037bcffbb05918f6efcff321c44cd1c39b1c47be7e67711e'
-            '8923258b451a885b2300169864a43e944f951963455da1c79b5f06693323be7d'
-            'b9a5545eb33621deb61676e9000fc0417d0b1e419143bc276174c34545d6b562'
-            'df36a5b2a09c46b415d92e7aa1f9fe587ddd1fc58a4ccfb269661cd338414089')
+sha256sums=('3af9ed51bce5b5c6f04c4a67a6008f98765ccde897c43fff670621ab70789553'
+            '777da4ec89376e654d9088ec70e3c5154dd8e31fa8de6f1f77f2d7d5f10bcd9b'
+            'e9afee84dfde3275807cc9b2eb1fb23b5074a12b8f896bd02d8b8f9963d545a6'
+            'cbf3675f3072bbab29fdf5541fd3c15986567a127f920cdaddcfff9e6a9d0283')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
@@ -77,7 +77,21 @@ package() {
   for _arch in ${_architectures}; do
     for _config in "${_configurations[@]}"; do
       pushd build-${_arch}-${_config##*=}
+
       make INSTALL_ROOT="$pkgdir" install
+
+      # Use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE
+      if [[ -d 'lib' ]]; then
+        pushd 'lib'
+        find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib" --parents {} +
+        popd
+      fi
+      if [[ -d 'plugins' ]]; then
+        pushd 'plugins'
+        find -iname '*.static.prl' -exec cp --target-directory "${pkgdir}/usr/${_arch}/lib/qt/plugins" --parents {} +
+        popd
+      fi
+
       find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name "*.dll" -exec rm {} \;
       [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \
         find "${pkgdir}/usr/${_arch}" -name "*.exe" -exec rm {} \; || \
@@ -89,6 +103,9 @@ package() {
       find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
       popd
     done
+
+    # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+    find "${pkgdir}/usr/${_arch}/lib" -type f -name '*.prl' -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
   done
 
   # Make sure the executables don't conflict with their mingw-qt4 counterpart