Update to 5.6.1

3 files changed, 20 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e87043884c27..345d1eca1e4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Apr 17 22:41:25 UTC 2016
+# Thu Jun 16 08:09:03 UTC 2016
 pkgbase = mingw-w64-qt5-webkit
 	pkgdesc = Classes for a WebKit2 based implementation and a new QML API (mingw-w64)
-	pkgver = 5.6.0
-	pkgrel = 2
+	pkgver = 5.6.1
+	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
 	groups = mingw-w64-qt
@@ -30,7 +30,7 @@ pkgbase = mingw-w64-qt5-webkit
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/community_releases/5.6/5.6.0/qtwebkit-opensource-src-5.6.0.tar.xz
+	source = https://download.qt.io/community_releases/5.6/5.6.1/qtwebkit-opensource-src-5.6.1.tar.xz
 	source = qt5-qtwebkit-dont-depend-on-icu.patch
 	source = qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch
 	source = qt5-qtwebkit-fix-compatibility-with-latest-angle.patch
@@ -40,9 +40,8 @@ pkgbase = mingw-w64-qt5-webkit
 	source = qtwebkit-opensource-src-5.0.1-debuginfo.patch
 	source = revert-qt4-unicode-removal.patch
 	source = webkit-commit-151422.patch
-	source = qt5-webkit-pthread.patch
-	md5sums = b68565d18db63ee4db998bb8e37608a5
-	md5sums = ce7d257e2b5b94fe3affd98f52d99d09
+	md5sums = 9ea7cb557375ba2fc7c62742c522d093
+	md5sums = 37dd6b694e1e178aa8b1815f7fe3537d
 	md5sums = ac574de962545d6a9e975b4db63c3e09
 	md5sums = 4ad37c7d4dda8e77bb0a25c671f79adc
 	md5sums = 228f28df2b10e417a325176f7878ebe1
@@ -51,7 +50,6 @@ pkgbase = mingw-w64-qt5-webkit
 	md5sums = 6aba6468efafb64943887079e258b799
 	md5sums = 4e374836f26853b4d82be0e87aa584a5
 	md5sums = c36fe581e0f3b61cef19415782b257ca
-	md5sums = f65286024f65ca87837171272fc8975d
 
 pkgname = mingw-w64-qt5-webkit
 
diff --git a/PKGBUILD b/PKGBUILD
index 61188268f279..5463dce483cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,8 +9,8 @@
 
 _qt_module=qtwebkit
 pkgname=mingw-w64-qt5-webkit
-pkgver=5.6.0
-pkgrel=2
+pkgver=5.6.1
+pkgrel=1
 arch=('any')
 pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)"
 depends=('mingw-w64-qt5-declarative'
@@ -45,10 +45,9 @@ source=("https://download.qt.io/community_releases/${pkgver:0:3}/${pkgver}/${_pk
         qtwebkit-dont-use-bundled-angle-libraries.patch
         qtwebkit-opensource-src-5.0.1-debuginfo.patch
         revert-qt4-unicode-removal.patch
-        webkit-commit-151422.patch
-        qt5-webkit-pthread.patch)
-md5sums=('b68565d18db63ee4db998bb8e37608a5'
-         'ce7d257e2b5b94fe3affd98f52d99d09'
+        webkit-commit-151422.patch)
+md5sums=('9ea7cb557375ba2fc7c62742c522d093'
+         '37dd6b694e1e178aa8b1815f7fe3537d'
          'ac574de962545d6a9e975b4db63c3e09'
          '4ad37c7d4dda8e77bb0a25c671f79adc'
          '228f28df2b10e417a325176f7878ebe1'
@@ -56,17 +55,13 @@ md5sums=('b68565d18db63ee4db998bb8e37608a5'
          'f452210683386f9c28f04d7dea0ecfc7'
          '6aba6468efafb64943887079e258b799'
          '4e374836f26853b4d82be0e87aa584a5'
-         'c36fe581e0f3b61cef19415782b257ca'
-         'f65286024f65ca87837171272fc8975d')
+         'c36fe581e0f3b61cef19415782b257ca')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "${srcdir}/${_pkgfqn}"
 
-  # see description inside the patch file
-  patch -p1 -i ../qt5-webkit-pthread.patch
-
   # note: most patches are originally from http://pkgs.fedoraproject.org/git/rpms/mingw-qt5-qtwebkit.git
   # however, I needed to update most of them in order to update to 5.6.0 and to use the latest ANGLE
 
@@ -121,10 +116,6 @@ build() {
   unset PKG_CONFIG_PATH
   cd "${srcdir}/${_pkgfqn}"
   for _arch in ${_architectures}; do
-    # Generate headers
-    # seems like this has been fixed
-    #${_arch}-syncqt.pl-qt5 ./Source -version ${pkgver}
-
     mkdir -p build-${_arch} && pushd build-${_arch}
 
     # Since Source/ThirdParty/ANGLE has been removed ensure files
@@ -134,9 +125,13 @@ build() {
 
     # SH_GLSL_OUTPUT has been renamed to SH_GLSL_COMPATIBILITY_OUTPUT
     # in the latest ANGLE version so I just add a definition for backward compatibility
+
+    # intrin.h needs to be included otherwise declaration of _mm_mfence is missing
+
     ${_arch}-qmake-qt5 \
-      QMAKE_CXXFLAGS+=-Wno-c++0x-compat \
-      DEFINES+=SH_GLSL_OUTPUT=SH_GLSL_COMPATIBILITY_OUTPUT \
+      "QMAKE_CXXFLAGS+=-Wno-c++0x-compat" \
+      "QMAKE_CXXFLAGS+='-include /usr/i686-w64-mingw32/include/intrin.h'" \
+      "DEFINES+=SH_GLSL_OUTPUT=SH_GLSL_COMPATIBILITY_OUTPUT" \
       ../WebKit.pro
     make
     popd
diff --git a/qt5-qtwebkit-dont-depend-on-icu.patch b/qt5-qtwebkit-dont-depend-on-icu.patch
index 1a72e9a9fe6a..46f5a19fce15 100644
--- a/qt5-qtwebkit-dont-depend-on-icu.patch
+++ b/qt5-qtwebkit-dont-depend-on-icu.patch
@@ -4,10 +4,10 @@
      }
  
      # Sanity checks that would prevent us from building the whole project altogether.
--    !android:!mac:!config_icu {
+-    !config_icu:!osx:!use?(wchar_unicode) {
 -       addReasonForSkippingBuild("ICU is required.")
 -    }
-+#    !android:!mac:!config_icu {
++#    !config_icu:!osx:!use?(wchar_unicode) {
 +#       addReasonForSkippingBuild("ICU is required.")
 +#    }
      production_build:blackberry {
@@ -254,14 +254,3 @@
      {
          TextBreakIterator* lineBreakIterator = 0;
          if (staticLineBreakIterator) {
---- qtwebkit-opensource-src-5.4.0/Tools/qmake/mkspecs/features/features.prf.orig	2014-12-29 23:30:47.372582743 +0100
-+++ qtwebkit-opensource-src-5.4.0/Tools/qmake/mkspecs/features/features.prf	2014-12-29 23:31:08.021797817 +0100
-@@ -142,7 +142,7 @@
-     # IndexedDB requires leveldb
-     enable?(indexed_database): WEBKIT_CONFIG += use_leveldb
- 
--    !config_icu:!mac: WEBKIT_CONFIG += use_wchar_unicode
-+#    !config_icu:!mac: WEBKIT_CONFIG += use_wchar_unicode
- 
-     export(WEBKIT_CONFIG)
-     export(CONFIGURE_WARNINGS)