Update to 5.9.2

4 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e76250b3336e..6ddfd2e63b14 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Jul  6 21:13:17 UTC 2017
+# Mon Oct 16 17:36:32 UTC 2017
 pkgbase = mingw-w64-qt5-activeqt
 	pkgdesc = ActiveX integration framework (mingw-w64)
-	pkgver = 5.9.1
+	pkgver = 5.9.2
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -21,12 +21,12 @@ pkgbase = mingw-w64-qt5-activeqt
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtactiveqt-opensource-src-5.9.2.tar.xz
 	source = 0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch
 	source = 0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
-	sha256sums = 8feae8a310c8866e3468f7a103db82df8db76298cdc8878fb7d4daf33a30f81f
-	sha256sums = 0490e38bb0d55dbecf7dcaa7fec7f886338672c20ffeb48ef74872370a8834a8
-	sha256sums = 44fd5316cf31f6cd1ecd56b67c550715a1e9194490fcd6f60344979cd826352d
+	sha256sums = 60458d1972075b7196122b01d0ef7929cef49cc3f0683f8e46cd3a65b44de5cf
+	sha256sums = 7e2f0bd1803d8c6d4ba3618a7ee02d3887f192ef9d3f6ab31d7f5468b515e3c0
+	sha256sums = b781aa5f1bccc9be056ba15f1ff3e557cd19b48ad212a37a529dc414844f3af1
 
 pkgname = mingw-w64-qt5-activeqt
 
diff --git a/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch b/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch
index 9addf05adf3e..8606e140dbbd 100644
--- a/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch
+++ b/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch
@@ -1,4 +1,4 @@
-From f4b17714bb335897cdd37c364afa60e42bb3dc68 Mon Sep 17 00:00:00 2001
+From 82a268b89f2c68be1ce2d10eb89634bd3bff9715 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 17:17:46 +0200
 Subject: [PATCH 1/2] Don't require windows.h when using native Linux gcc
@@ -17,5 +17,5 @@ index 1898ed5..524ee2e 100644
  SOURCES = main.cpp
  
 -- 
-2.13.2
+2.14.2
 
diff --git a/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
index 72809db886a7..e82bc22f6f0b 100644
--- a/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
+++ b/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
@@ -1,4 +1,4 @@
-From 1d0c3e925df25fefdbc5cdbc08a7ba203adc6542 Mon Sep 17 00:00:00 2001
+From ba803e4196000080e8e5b5abce811e54318eb08e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 17:21:08 +0200
 Subject: [PATCH 2/2] Handle win64 in dumpcpp and
@@ -11,7 +11,7 @@ See https://bugreports.qt.io/browse/QTBUG-46827
  2 files changed, 12 insertions(+)
 
 diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
-index 22aec57..64b2f47 100644
+index cd564d3..f3c55b1 100644
 --- a/src/activeqt/container/qaxbase.cpp
 +++ b/src/activeqt/container/qaxbase.cpp
 @@ -2170,6 +2170,10 @@ void MetaObjectGenerator::readClassInfo()
@@ -52,5 +52,5 @@ index 1f0cca8..d26bd78 100644
      }
  
 -- 
-2.13.2
+2.14.2
 
diff --git a/PKGBUILD b/PKGBUILD
index 9819f35aef17..8e98c5b4db7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtactiveqt
 pkgname=mingw-w64-qt5-activeqt
-pkgver=5.9.1
+pkgver=5.9.2
 pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"
@@ -23,15 +23,15 @@ _pkgfqn="${_qt_module}-opensource-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch'
         '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch')
-sha256sums=('8feae8a310c8866e3468f7a103db82df8db76298cdc8878fb7d4daf33a30f81f'
-            '0490e38bb0d55dbecf7dcaa7fec7f886338672c20ffeb48ef74872370a8834a8'
-            '44fd5316cf31f6cd1ecd56b67c550715a1e9194490fcd6f60344979cd826352d')
+sha256sums=('60458d1972075b7196122b01d0ef7929cef49cc3f0683f8e46cd3a65b44de5cf'
+            '7e2f0bd1803d8c6d4ba3618a7ee02d3887f192ef9d3f6ab31d7f5468b515e3c0'
+            'b781aa5f1bccc9be056ba15f1ff3e557cd19b48ad212a37a529dc414844f3af1')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
   makedepends+=('mingw-w64-qt5-base-static') \
   optdepends+=('mingw-w64-qt5-base-static: use of static libraries') \
-  _configurations+=('CONFIG+=static')
+  _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static')
 
 prepare() {
   cd "${srcdir}/${_pkgfqn}"