Update to 5.8.0

11 files changed, 51 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 600e83ec5fa4..413db4948124 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 # Generated by mksrcinfo v8
-# Mon Dec 26 22:50:28 UTC 2016
+# Thu Feb  9 20:34:28 UTC 2017
 pkgbase = mingw-w64-qt5-webkit
 	pkgdesc = Classes for a WebKit2 based implementation and a new QML API (mingw-w64)
-	pkgver = 5.7.1
+	pkgver = 5.8.0
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
-	groups = mingw-w64-qt
 	groups = mingw-w64-qt5
 	license = GPL3
 	license = LGPL
 	license = FDL
 	license = custom
 	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-pkg-config
 	makedepends = python
 	makedepends = gperf
 	makedepends = ruby
-	makedepends = mingw-w64-pkg-config
 	depends = mingw-w64-qt5-declarative
 	depends = mingw-w64-qt5-sensors
 	depends = mingw-w64-qt5-location
@@ -33,7 +32,7 @@ pkgbase = mingw-w64-qt5-webkit
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz
+	source = https://download.qt.io/community_releases/5.8/5.8.0-final/qtwebkit-opensource-src-5.8.0.tar.xz
 	source = 0001-Use-correct-ICU-libs.patch
 	source = 0002-Use-pkg-config.patch
 	source = 0003-Use-system-ANGLE-rather-than-bundled-version.patch
@@ -43,16 +42,16 @@ pkgbase = mingw-w64-qt5-webkit
 	source = 0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch
 	source = 0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
 	source = 0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch
-	md5sums = 4fa8f47383ce36d59dcc36d701ce93cd
-	md5sums = 723721e8a6e849d7504d81e2f842d563
-	md5sums = 18cdfcc4d7287a4ffd0a83c720c92140
-	md5sums = c69032c133d7f49a6eef699ad9104ae2
-	md5sums = 0a3af101516cbdb229fbbbb79eb4fc1a
-	md5sums = d66ccc9e2407cc454dfb9207ba1a006f
-	md5sums = 7cc0eb1eb242f048dd200d76dc528dec
-	md5sums = bf52db2fb9589b12f98e2e90ca635677
-	md5sums = f60cbd16a5e43a0cf2cc3bb1d00a3a08
-	md5sums = 40e45a139a7bd98c79e73af654351810
+	md5sums = 60a6935aca4a7c553d0ec4646ceed3b4
+	md5sums = 208ff77dc291de1c91b8143e7fb9c1ae
+	md5sums = 1ea0dc59ce4283e533126a0abb30f21a
+	md5sums = 695ba1f69129024dd3abb0bf6eb2b736
+	md5sums = 6b65ea17730b99ee3e24821089624d56
+	md5sums = fdacb552245d089c77017977f52e8d51
+	md5sums = 5964c02a0dcf8c4af354bc0a0f4babd3
+	md5sums = 83fae95c74b670d84a03985d3dbd83d0
+	md5sums = 307d500b217ca9183d9f97d617461803
+	md5sums = a9fd04dcfe19ef9458a0485219f24c64
 
 pkgname = mingw-w64-qt5-webkit
 
diff --git a/0001-Use-correct-ICU-libs.patch b/0001-Use-correct-ICU-libs.patch
index fd9d0f26b080..ac0b5ede7e18 100644
--- a/0001-Use-correct-ICU-libs.patch
+++ b/0001-Use-correct-ICU-libs.patch
@@ -1,4 +1,4 @@
-From 32ba6b8bf5d5f6d62e558965308e93e13d95d76f Mon Sep 17 00:00:00 2001
+From 5d5d3ebbe9edcec899f4d11ce6709c533b446e25 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:53:59 +0200
 Subject: [PATCH 1/9] Use correct ICU libs
@@ -10,7 +10,7 @@ exactly the same as their native Linux counterpart
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri
-index 1f4866d66..5d8933ae1 100644
+index 69e4cd1f3..b553075c2 100644
 --- a/Source/WTF/WTF.pri
 +++ b/Source/WTF/WTF.pri
 @@ -14,7 +14,7 @@ mac {
diff --git a/0002-Use-pkg-config.patch b/0002-Use-pkg-config.patch
index 2d4fab53452c..0df2d658e87f 100644
--- a/0002-Use-pkg-config.patch
+++ b/0002-Use-pkg-config.patch
@@ -1,4 +1,4 @@
-From 963e661fc032d90f4eb4dc9820ad278e7d929414 Mon Sep 17 00:00:00 2001
+From 8143ac0ef800d154d1dc24204e98e346f7af97d6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:56:42 +0200
 Subject: [PATCH 2/9] Use pkg-config
diff --git a/0003-Use-system-ANGLE-rather-than-bundled-version.patch b/0003-Use-system-ANGLE-rather-than-bundled-version.patch
index 8b392a876693..d46afe9f1b50 100644
--- a/0003-Use-system-ANGLE-rather-than-bundled-version.patch
+++ b/0003-Use-system-ANGLE-rather-than-bundled-version.patch
@@ -1,4 +1,4 @@
-From 10236100311a81cc32f0c660e034fb167c730521 Mon Sep 17 00:00:00 2001
+From 15e8abbefe0e71c29c106f1e7b54bd1f4b7433f8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Nov 2016 12:14:01 +0100
 Subject: [PATCH 3/9] Use system ANGLE rather than bundled version
diff --git a/0004-Prevent-symbols-not-being-exported-in-Qt5WebKit.dll.patch b/0004-Prevent-symbols-not-being-exported-in-Qt5WebKit.dll.patch
index 3efb0bd32920..0c2e9af67dc5 100644
--- a/0004-Prevent-symbols-not-being-exported-in-Qt5WebKit.dll.patch
+++ b/0004-Prevent-symbols-not-being-exported-in-Qt5WebKit.dll.patch
@@ -1,4 +1,4 @@
-From ee3e4e5bea2632ca06abb3936c10a57b2ebeedef Mon Sep 17 00:00:00 2001
+From 1059d77bb26bb03485fa2ab2f5770dec215a2de5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 22:08:26 +0200
 Subject: [PATCH 4/9] Prevent symbols not being exported in Qt5WebKit.dll
diff --git a/0005-Build-with-smaller-debug-info.patch b/0005-Build-with-smaller-debug-info.patch
index 9f5b7a1f532c..167853f6175b 100644
--- a/0005-Build-with-smaller-debug-info.patch
+++ b/0005-Build-with-smaller-debug-info.patch
@@ -1,4 +1,4 @@
-From b76e20abff2c6412daaf257b762be00fd628c77a Mon Sep 17 00:00:00 2001
+From 75d96925cc98690d90d8210566a6311c963219d4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 22:13:44 +0200
 Subject: [PATCH 5/9] Build with smaller debug info
@@ -30,7 +30,7 @@ index dec9d42a9..910fc4eda 100644
  
  INCLUDEPATH += \
 diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri
-index 5d8933ae1..2ef42ca3e 100644
+index b553075c2..64877cb3b 100644
 --- a/Source/WTF/WTF.pri
 +++ b/Source/WTF/WTF.pri
 @@ -8,6 +8,12 @@
@@ -47,7 +47,7 @@ index 5d8933ae1..2ef42ca3e 100644
      # Mac OS does ship libicu but not the associated header files.
      # Therefore WebKit provides adequate header files.
 diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
-index 37cde573a..ddad897be 100644
+index 26e9b8424..d6c32e80c 100644
 --- a/Source/WebCore/WebCore.pri
 +++ b/Source/WebCore/WebCore.pri
 @@ -7,6 +7,12 @@
diff --git a/0006-Establish-compatibility-with-latest-ANGLE.patch b/0006-Establish-compatibility-with-latest-ANGLE.patch
index befbed382d70..6c953cc69b9d 100644
--- a/0006-Establish-compatibility-with-latest-ANGLE.patch
+++ b/0006-Establish-compatibility-with-latest-ANGLE.patch
@@ -1,4 +1,4 @@
-From a565915a6e70d1b6e3790a04a036fbce25c58b77 Mon Sep 17 00:00:00 2001
+From 5134bfb5375b9bedf5bdb15c8fadf441285802d9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 22:19:57 +0200
 Subject: [PATCH 6/9] Establish compatibility with latest ANGLE
diff --git a/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch b/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch
index 6d3892b42de4..4c4a8602eaf3 100644
--- a/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch
+++ b/0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch
@@ -1,4 +1,4 @@
-From 84a00afd27fca2550ecd068915b9551edb191e5b Mon Sep 17 00:00:00 2001
+From e2623801cfd15fdf24f0af2bfc01bdfb2b0ca22d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 22:21:54 +0200
 Subject: [PATCH 7/9] Include intrin.h for declaration of _mm_mfence
diff --git a/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch b/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
index f2923c864e29..3c8b2725c62a 100644
--- a/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
+++ b/0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch
@@ -1,32 +1,31 @@
-From c139872c275f2bb62558b113048f0f3e54997d94 Mon Sep 17 00:00:00 2001
+From 8f0a0019f827815161291e4f63dfe8d15d32bd60 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Nov 2016 12:46:27 +0100
 Subject: [PATCH 8/9] Link against ANGLE even if Qt is configured not to
 
 ---
- Source/WebCore/WebCore.pri | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
+ Source/WebCore/WebCore.pri | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
 
 diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
-index ddad897be..f69e22492 100644
+index d6c32e80c..42aadaacc 100644
 --- a/Source/WebCore/WebCore.pri
 +++ b/Source/WebCore/WebCore.pri
-@@ -215,15 +215,11 @@ enable?(WEB_AUDIO) {
- use?(3D_GRAPHICS) {
+@@ -216,14 +216,11 @@ use?(3D_GRAPHICS) {
      win32: {
          mingw: {
--            # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
--            contains(QT_CONFIG, opengles2) {
--                CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
+             # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
+-            qtConfig(opengles2) {
+-                CONFIG(debug, debug|release):qtConfig(angle) {
 -                    LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
 -                } else {
 -                    LIBS += $$QMAKE_LIBS_OPENGL_ES2
 -                }
-+            # Always link against ANGLE
-+            CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
++            CONFIG(debug, debug|release):qtConfig(angle) {
 +                LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
              } else {
 -                LIBS += $$QMAKE_LIBS_OPENGL
++                # Always link against ANGLE
 +                LIBS += $$QMAKE_LIBS_OPENGL_ES2
              }
          }
diff --git a/0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch b/0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch
index 45dfa65e1ce0..ba117b70c3ef 100644
--- a/0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch
+++ b/0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch
@@ -1,4 +1,4 @@
-From 72acfdf5a9af50e3e2b8ba16fca16fb4408906f6 Mon Sep 17 00:00:00 2001
+From eeb2ce34b4997d7f959ff7c789441ed97c2f1934 Mon Sep 17 00:00:00 2001
 From: Konstantin Tokarev <annulen@yandex.ru>
 Date: Fri, 4 Nov 2016 00:44:49 +0300
 Subject: [PATCH 9/9] Fixed crash (probably miscompilation) with MinGW-w64
diff --git a/PKGBUILD b/PKGBUILD
index 86bf1c98d456..05420eee674e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
 
 _qt_module=qtwebkit
 pkgname=mingw-w64-qt5-webkit
-pkgver=5.7.1
+pkgver=5.8.0
 pkgrel=1
 arch=('any')
 pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)"
@@ -36,13 +36,14 @@ depends=('mingw-w64-qt5-declarative'
 #depends+=('mingw-w64-webchannel')
 #depends+=('mingw-w64-gst-plugins-base')
 #optdepends+=('mingw-w64-gst-plugins-good: Webm codec support')
-makedepends=('mingw-w64-gcc' 'python' 'gperf' 'ruby' 'mingw-w64-pkg-config')
+makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'python' 'gperf' 'ruby')
 options=('!strip' '!buildflags' 'staticlibs')
+groups=('mingw-w64-qt5')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-url="https://www.qt.io/"
+url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-opensource-src-${pkgver}"
-groups=(mingw-w64-qt mingw-w64-qt5)
-source=("https://download.qt.io/community_releases/${pkgver:0:3}/${pkgver}/${_pkgfqn}.tar.xz"
+groups=('mingw-w64-qt5')
+source=("https://download.qt.io/community_releases/${pkgver:0:3}/${pkgver}-final/${_pkgfqn}.tar.xz"
          '0001-Use-correct-ICU-libs.patch'
          '0002-Use-pkg-config.patch'
          '0003-Use-system-ANGLE-rather-than-bundled-version.patch'
@@ -52,16 +53,16 @@ source=("https://download.qt.io/community_releases/${pkgver:0:3}/${pkgver}/${_pk
          '0007-Include-intrin.h-for-declaration-of-_mm_mfence.patch'
          '0008-Link-against-ANGLE-even-if-Qt-is-configured-not-to.patch'
          '0009-Fixed-crash-probably-miscompilation-with-MinGW-w64-5.patch')
-md5sums=('4fa8f47383ce36d59dcc36d701ce93cd'
-         '723721e8a6e849d7504d81e2f842d563'
-         '18cdfcc4d7287a4ffd0a83c720c92140'
-         'c69032c133d7f49a6eef699ad9104ae2'
-         '0a3af101516cbdb229fbbbb79eb4fc1a'
-         'd66ccc9e2407cc454dfb9207ba1a006f'
-         '7cc0eb1eb242f048dd200d76dc528dec'
-         'bf52db2fb9589b12f98e2e90ca635677'
-         'f60cbd16a5e43a0cf2cc3bb1d00a3a08'
-         '40e45a139a7bd98c79e73af654351810')
+md5sums=('60a6935aca4a7c553d0ec4646ceed3b4'
+         '208ff77dc291de1c91b8143e7fb9c1ae'
+         '1ea0dc59ce4283e533126a0abb30f21a'
+         '695ba1f69129024dd3abb0bf6eb2b736'
+         '6b65ea17730b99ee3e24821089624d56'
+         'fdacb552245d089c77017977f52e8d51'
+         '5964c02a0dcf8c4af354bc0a0f4babd3'
+         '83fae95c74b670d84a03985d3dbd83d0'
+         '307d500b217ca9183d9f97d617461803'
+         'a9fd04dcfe19ef9458a0485219f24c64')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'