updated to 5.6.0

2 files changed, 22 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4a06b7c0b404..e357d3bb0413 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Mar 10 19:13:19 UTC 2016
+# Mon Mar 28 17:31:59 UTC 2016
 pkgbase = mingw-w64-qt5-webkit
 	pkgdesc = Classes for a WebKit2 based implementation and a new QML API (mingw-w64)
-	pkgver = 5.5.1
-	pkgrel = 2
+	pkgver = 5.6.0
+	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
 	groups = mingw-w64-qt
@@ -14,7 +14,6 @@ pkgbase = mingw-w64-qt5-webkit
 	makedepends = gperf
 	makedepends = ruby
 	makedepends = mingw-w64-pkg-config
-	depends = mingw-w64-qt5-base
 	depends = mingw-w64-qt5-declarative
 	depends = mingw-w64-qt5-sensors
 	depends = mingw-w64-qt5-location
@@ -31,23 +30,21 @@ pkgbase = mingw-w64-qt5-webkit
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz
+	source = https://download.qt.io/community_releases/5.6/5.6.0/qtwebkit-opensource-src-5.6.0.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
 	source = qt5-qtwebkit-use-correct-icu-libs.patch
-	source = qt5-qtwebkit-use-linux-shell.patch
 	source = qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch
 	source = qtwebkit-dont-use-bundled-angle-libraries.patch
 	source = qtwebkit-opensource-src-5.0.1-debuginfo.patch
 	source = revert-qt4-unicode-removal.patch
 	source = webkit-commit-151422.patch
-	md5sums = 681328edb539b8fa3a273b38c90b3e31
+	md5sums = eba1382587add1c9b1293a532e7dd161
 	md5sums = ce7d257e2b5b94fe3affd98f52d99d09
 	md5sums = ac574de962545d6a9e975b4db63c3e09
 	md5sums = 4ad37c7d4dda8e77bb0a25c671f79adc
 	md5sums = 228f28df2b10e417a325176f7878ebe1
-	md5sums = 680fe925113911f6b6c36946d7294cbd
 	md5sums = 18b21fd8e9517f48db7748544d2aa92f
 	md5sums = f452210683386f9c28f04d7dea0ecfc7
 	md5sums = 6aba6468efafb64943887079e258b799
diff --git a/PKGBUILD b/PKGBUILD
index 3a7bc68901f2..acd7b9899589 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,16 @@
 # Contributor: ant32 <antreimer@gmail.com>
 # Contributor: Filip Brcic <brcha@gna.org>
 
+# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
+# you also find the URL of a binary repository.
+
 _qt_module=qtwebkit
 pkgname=mingw-w64-qt5-webkit
-pkgver=5.5.1
-pkgrel=2
+pkgver=5.6.0
+pkgrel=1
 arch=(any)
 pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)"
-depends=('mingw-w64-qt5-base'
-         'mingw-w64-qt5-declarative'
+depends=('mingw-w64-qt5-declarative'
          'mingw-w64-qt5-sensors'
          'mingw-w64-qt5-location'
          'mingw-w64-qt5-multimedia'
@@ -28,23 +30,21 @@ license=("custom, FDL, GPL3, LGPL")
 url="https://www.qt.io/"
 _pkgfqn="${_qt_module}-opensource-src-${pkgver}"
 groups=(mingw-w64-qt mingw-w64-qt5)
-source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+source=("https://download.qt.io/community_releases/${pkgver:0:3}/${pkgver}/${_pkgfqn}.tar.xz"
         qt5-qtwebkit-dont-depend-on-icu.patch
         qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch
         qt5-qtwebkit-fix-compatibility-with-latest-angle.patch
         qt5-qtwebkit-use-correct-icu-libs.patch
-        qt5-qtwebkit-use-linux-shell.patch
         qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch
         qtwebkit-dont-use-bundled-angle-libraries.patch
         qtwebkit-opensource-src-5.0.1-debuginfo.patch
         revert-qt4-unicode-removal.patch
         webkit-commit-151422.patch)
-md5sums=('681328edb539b8fa3a273b38c90b3e31'
+md5sums=('eba1382587add1c9b1293a532e7dd161'
          'ce7d257e2b5b94fe3affd98f52d99d09'
          'ac574de962545d6a9e975b4db63c3e09'
          '4ad37c7d4dda8e77bb0a25c671f79adc'
          '228f28df2b10e417a325176f7878ebe1'
-         '680fe925113911f6b6c36946d7294cbd'
          '18b21fd8e9517f48db7748544d2aa92f'
          'f452210683386f9c28f04d7dea0ecfc7'
          '6aba6468efafb64943887079e258b799'
@@ -59,7 +59,7 @@ prepare() {
   # note: all patches are from http://pkgs.fedoraproject.org/git/rpms/mingw-qt5-qtwebkit.git
 
   # The ICU libraries used for cross-compilation are named exactly the same as their native Linux counterpart
-  #patch -p0 -b -i ../qt5-qtwebkit-use-correct-icu-libs.patch
+  patch -p1 -b -i ../qt5-qtwebkit-use-correct-icu-libs.patch
 
   # By default the build system assumes that pkg-config isn't used for the win32 target
   # However, we're using it in the Fedora MinGW toolchain so make sure it is used automatically
@@ -101,9 +101,6 @@ prepare() {
   # Fix compatibility issue when using the latest ANGLE
   patch -p1 -b -i ../qt5-qtwebkit-fix-compatibility-with-latest-angle.patch
 
-  # Use linux shell commands instead of windows cmd commands
-  patch -p1 -b -i ../qt5-qtwebkit-use-linux-shell.patch
-
   # Make sure the bundled copy of the ANGLE libraries isn't used
   rm -rf Source/ThirdParty/ANGLE
 }
@@ -112,13 +109,18 @@ build() {
   unset PKG_CONFIG_PATH
   cd "${srcdir}/${_pkgfqn}"
   for _arch in ${_architectures}; do
+    # Generate headers
+    ${_arch}-syncqt.pl-qt5 ./Source -version ${pkgver}
+
+    mkdir -p build-${_arch} && pushd build-${_arch}
+
     # Since Source/ThirdParty/ANGLE has been removed ensure files
-    # from system ANGLE can be included
-    export CPATH=/usr/$_arch/include:/usr/$_arch/include/GLSLANG
+    # from system ANGLE can be included (patches from Fedora don't help
+    # here because Fedora uses other paths)
+    export CPATH="$CPATH:/usr/$_arch/include:/usr/$_arch/include/GLSLANG"
 
     # 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
-    mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-qmake-qt5 \
       QMAKE_CXXFLAGS+=-Wno-c++0x-compat \
       DEFINES+=SH_GLSL_OUTPUT=SH_GLSL_COMPATIBILITY_OUTPUT \