updated version (to 5.5.1), URL and description

14 files changed, 559 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16ac30b4f253..50547e02e4d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,10 @@
+# Generated by mksrcinfo v8
+# Thu Feb  4 13:39:09 UTC 2016
 pkgbase = mingw-w64-qt5-webkit
 	pkgdesc = Classes for a WebKit2 based implementation and a new QML API (mingw-w64)
-	pkgver = 5.4.2
+	pkgver = 5.5.1
 	pkgrel = 1
-	url = http://qt-project.org
+	url = https://www.qt.io/
 	arch = any
 	groups = mingw-w64-qt
 	groups = mingw-w64-qt5
@@ -29,24 +31,40 @@ pkgbase = mingw-w64-qt5-webkit
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = http://download.qt-project.org/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz
-	source = qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch
-	source = qtwebkit-dont-use-bundled-angle-libraries.patch
+	source = https://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz
+	source = qt5-angleproject-dont-use-winflex.patch
+	source = qt5-qtwebkit-angle-build-fix.patch
+	source = qt5-qtwebkit-commit-5742b32.patch
+	source = qt5-qtwebkit-commit-b8c97e702.patch
+	source = qt5-qtwebkit-disable-3d-graphics-support.patch
 	source = qt5-qtwebkit-dont-depend-on-icu.patch
-	source = revert-qt4-unicode-removal.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-142567.patch
 	source = webkit-commit-151422.patch
-	source = qt5-qtwebkit-fix-compatibility-with-latest-angle.patch
-	md5sums = b711b3f32646d72cd281b3c17ab6d14e
+	md5sums = 681328edb539b8fa3a273b38c90b3e31
+	md5sums = 445ada3000f0cc1279204b7a3efc3b4c
+	md5sums = bc1943fb276964f710b4e9f5f08bb2ec
+	md5sums = 645c05f212fcd9f310798f7eacd9abd4
+	md5sums = 87458f3ebb61bf598e4fce10ab1ccbb7
+	md5sums = b227653519ee0ea5d388bd58a21b6d66
+	md5sums = ce7d257e2b5b94fe3affd98f52d99d09
 	md5sums = ac574de962545d6a9e975b4db63c3e09
+	md5sums = 7038206bfef2aea594f10af3bda90220
+	md5sums = 228f28df2b10e417a325176f7878ebe1
+	md5sums = 680fe925113911f6b6c36946d7294cbd
+	md5sums = 18b21fd8e9517f48db7748544d2aa92f
 	md5sums = f452210683386f9c28f04d7dea0ecfc7
-	md5sums = 069f86d834bcecb7fe0937b7539d28af
-	md5sums = 4e374836f26853b4d82be0e87aa584a5
-	md5sums = 8b60ddebf01ee04a0e1180e98cdd3d52
 	md5sums = 6aba6468efafb64943887079e258b799
+	md5sums = 4e374836f26853b4d82be0e87aa584a5
+	md5sums = eaac9af299b50c2f03f4c322123e6e62
 	md5sums = c36fe581e0f3b61cef19415782b257ca
-	md5sums = 2ef87f4b6588e92a925f42c3b9595379
 
 pkgname = mingw-w64-qt5-webkit
 
diff --git a/PKGBUILD b/PKGBUILD
index 0262850e8032..ce8cb8171912 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: ant32 <antreimer@gmail.com>
 # Contributor: Filip Brcic <brcha@gna.org>
+
 _qt_module=qtwebkit
 pkgname=mingw-w64-qt5-webkit
-pkgver=5.4.2
+pkgver=5.5.1
 pkgrel=1
 arch=(any)
 pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)"
@@ -23,32 +24,51 @@ depends=('mingw-w64-qt5-base'
 makedepends=('mingw-w64-gcc' 'python' 'gperf' 'ruby' 'mingw-w64-pkg-config')
 options=('!strip' '!buildflags' 'staticlibs')
 license=("custom, FDL, GPL3, LGPL")
-url="http://qt-project.org"
+url="https://www.qt.io/"
 _pkgfqn="${_qt_module}-opensource-src-${pkgver}"
 groups=(mingw-w64-qt mingw-w64-qt5)
-source=("http://download.qt-project.org/official_releases/qt/5.4/${pkgver}/submodules/${_pkgfqn}.tar.xz"
-        'qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch'
-        'qtwebkit-dont-use-bundled-angle-libraries.patch'
-        'qt5-qtwebkit-dont-depend-on-icu.patch'
-        'revert-qt4-unicode-removal.patch'
-        'qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch'
-        'qtwebkit-opensource-src-5.0.1-debuginfo.patch'
-        'webkit-commit-151422.patch'
-        'qt5-qtwebkit-fix-compatibility-with-latest-angle.patch')
-md5sums=('b711b3f32646d72cd281b3c17ab6d14e'
+source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+        qt5-angleproject-dont-use-winflex.patch
+        qt5-qtwebkit-angle-build-fix.patch
+        qt5-qtwebkit-commit-5742b32.patch
+        qt5-qtwebkit-commit-b8c97e702.patch
+        qt5-qtwebkit-disable-3d-graphics-support.patch
+        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-142567.patch
+        webkit-commit-151422.patch)
+md5sums=('681328edb539b8fa3a273b38c90b3e31'
+         '445ada3000f0cc1279204b7a3efc3b4c'
+         'bc1943fb276964f710b4e9f5f08bb2ec'
+         '645c05f212fcd9f310798f7eacd9abd4'
+         '87458f3ebb61bf598e4fce10ab1ccbb7'
+         'b227653519ee0ea5d388bd58a21b6d66'
+         'ce7d257e2b5b94fe3affd98f52d99d09'
          'ac574de962545d6a9e975b4db63c3e09'
+         '7038206bfef2aea594f10af3bda90220'
+         '228f28df2b10e417a325176f7878ebe1'
+         '680fe925113911f6b6c36946d7294cbd'
+         '18b21fd8e9517f48db7748544d2aa92f'
          'f452210683386f9c28f04d7dea0ecfc7'
-         '069f86d834bcecb7fe0937b7539d28af'
-         '4e374836f26853b4d82be0e87aa584a5'
-         '8b60ddebf01ee04a0e1180e98cdd3d52'
          '6aba6468efafb64943887079e258b799'
-         'c36fe581e0f3b61cef19415782b257ca'
-         '2ef87f4b6588e92a925f42c3b9595379')
+         '4e374836f26853b4d82be0e87aa584a5'
+         'eaac9af299b50c2f03f4c322123e6e62'
+         'c36fe581e0f3b61cef19415782b257ca')
+
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd "${srcdir}/${_pkgfqn}"
 
+  # 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
 
@@ -92,6 +112,9 @@ 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
 }
@@ -100,6 +123,10 @@ build() {
   unset PKG_CONFIG_PATH
   cd "${srcdir}/${_pkgfqn}"
   for _arch in ${_architectures}; do
+    # Since Source/ThirdParty/ANGLE has been removed ensure files
+    # from system ANGLE can be included
+    export CPATH=/usr/$_arch/include:/usr/$_arch/include/GLSLANG
+
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-qmake-qt5 QMAKE_CXXFLAGS+=-Wno-c++0x-compat ../WebKit.pro
     make
diff --git a/PKGBUILD.bak b/PKGBUILD.bak
new file mode 100644
index 000000000000..f5215af06bd3
--- /dev/null
+++ b/PKGBUILD.bak
@@ -0,0 +1,143 @@
+# Maintainer: ant32 <antreimer@gmail.com>
+# Contributor: Filip Brcic <brcha@gna.org>
+
+_qt_module=qtwebkit
+pkgname=mingw-w64-qt5-webkit
+pkgver=5.5.1
+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'
+         'mingw-w64-qt5-sensors'
+         'mingw-w64-qt5-location'
+         'mingw-w64-qt5-multimedia'
+         'mingw-w64-angleproject'
+         'mingw-w64-fontconfig'
+         'mingw-w64-libpng'
+         'mingw-w64-libjpeg-turbo'
+         'mingw-w64-libxslt'
+         'mingw-w64-zlib'
+         'mingw-w64-icu'
+         'mingw-w64-sqlite'
+         'mingw-w64-libwebp')
+makedepends=('mingw-w64-gcc' 'python' 'gperf' 'ruby' 'mingw-w64-pkg-config')
+options=('!strip' '!buildflags' 'staticlibs')
+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"
+        qt5-angleproject-dont-use-winflex.patch
+        qt5-qtwebkit-angle-build-fix.patch
+        qt5-qtwebkit-commit-5742b32.patch
+        qt5-qtwebkit-commit-b8c97e702.patch
+        qt5-qtwebkit-disable-3d-graphics-support.patch
+        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-142567.patch
+        webkit-commit-151422.patch)
+md5sums=('681328edb539b8fa3a273b38c90b3e31'
+         '445ada3000f0cc1279204b7a3efc3b4c'
+         'bc1943fb276964f710b4e9f5f08bb2ec'
+         '645c05f212fcd9f310798f7eacd9abd4'
+         '87458f3ebb61bf598e4fce10ab1ccbb7'
+         'b227653519ee0ea5d388bd58a21b6d66'
+         'ce7d257e2b5b94fe3affd98f52d99d09'
+         'ac574de962545d6a9e975b4db63c3e09'
+         '7038206bfef2aea594f10af3bda90220'
+         '228f28df2b10e417a325176f7878ebe1'
+         '680fe925113911f6b6c36946d7294cbd'
+         '18b21fd8e9517f48db7748544d2aa92f'
+         'f452210683386f9c28f04d7dea0ecfc7'
+         '6aba6468efafb64943887079e258b799'
+         '4e374836f26853b4d82be0e87aa584a5'
+         'eaac9af299b50c2f03f4c322123e6e62'
+         'c36fe581e0f3b61cef19415782b257ca')
+
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
+prepare() {
+  cd "${srcdir}/${_pkgfqn}"
+
+  # 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
+
+  # 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
+  patch -p0 -b -i ../qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch
+
+  # Make sure the bundled copy of the ANGLE library isn't used
+  patch -p1 -b -i ../qtwebkit-dont-use-bundled-angle-libraries.patch
+
+  # qtwebkit depends on qtbase with ICU support.
+  # As ICU support in qtbase also introduces over 20MB of additional dependency
+  # bloat (and the qtbase libraries itself are only 13MB) the decision was made
+  # to build qtbase without ICU support.
+  # Make sure qtwebkit doesn't depend on a qtbase with ICU support any more
+  patch -p1 -b -i ../qt5-qtwebkit-dont-depend-on-icu.patch
+
+  # Undo the removal of the old Qt4 based unicode support
+  # as we want to use it instead of the bloated ICU
+  patch -p1 -R -b -i ../revert-qt4-unicode-removal.patch
+
+  # WebKit svn commit 136242 implemented a split into QtWebKit and QtWebKitWidgets
+  # Due to this change a static library named WebKit1.a is created first.
+  # After this a shared library is created named Qt5WebKit.dll which contains
+  # the contents of this static library and some other object files.
+  # However, various symbols in the static library are expected to be exported
+  # in the Qt5WebKit.dll shared library. As static libraries normally don't care
+  # about exported symbols (everything is exported after all) the decoration
+  # attribute Q_DECL_EXPORT won't be set.
+  # This results in undefined references when trying to link the QtWebKitWidgets
+  # shared library (which depends on various symbols which aren't exported properly
+  # in the Qt5WebKit.dll shared library)
+  patch -p0 -b -i ../qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch
+
+  # smaller debuginfo s/-g/-g1/ (debian uses -gstabs) to avoid 4gb size limit
+  patch -p1 -b -i ../qtwebkit-opensource-src-5.0.1-debuginfo.patch 
+
+  # Revert commit 151422 to fix a build failure which happens because we're not using ICU
+  patch -p1 -R -b -i ../webkit-commit-151422.patch
+
+  # 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
+}
+
+build() {
+  unset PKG_CONFIG_PATH
+  cd "${srcdir}/${_pkgfqn}"
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-qmake-qt5 QMAKE_CXXFLAGS+=-Wno-c++0x-compat ../WebKit.pro
+    make
+    popd
+  done
+}
+
+package() {
+  for _arch in ${_architectures}; do
+    cd "${srcdir}/${_pkgfqn}/build-${_arch}"
+    make INSTALL_ROOT="${pkgdir}" install
+
+    # The .dll's are installed in both bindir and libdir
+    # One copy of the .dll's is sufficient
+    rm -f "${pkgdir}/usr/${_arch}/lib/"*.dll
+    find "${pkgdir}/usr/${_arch}" -name "*.exe" -o -name "*.bat" -o -name "*.def" -o -name "*.exp" -o -name '*.prl' | xargs -rtl1 rm
+    find "${pkgdir}/usr/${_arch}" -name "*.dll" -exec ${_arch}-strip --strip-unneeded {} \;
+    find "${pkgdir}/usr/${_arch}" -name "*.a" -o -name "*.dll" | xargs -rtl1 ${_arch}-strip -g
+  done
+}
diff --git a/qt5-angleproject-dont-use-winflex.patch b/qt5-angleproject-dont-use-winflex.patch
new file mode 100644
index 000000000000..98c3ac1de170
--- /dev/null
+++ b/qt5-angleproject-dont-use-winflex.patch
@@ -0,0 +1,11 @@
+--- qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/default_pre.prf.orig	2013-01-04 22:00:45.442588676 +0100
++++ qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/default_pre.prf	2013-01-04 22:01:10.427771469 +0100
+@@ -98,7 +98,7 @@
+ # A newer version of flex is required on Windows. At the moment the only
+ # one that appears to provide binaries and is not cygwin is winflex.
+ FLEX = flex
+-win32: FLEX = win_flex
++win32:!win32-g++*: FLEX = win_flex
+ 
+ BIN_EXTENSION =
+ win32: BIN_EXTENSION = .exe
diff --git a/qt5-qtwebkit-angle-build-fix.patch b/qt5-qtwebkit-angle-build-fix.patch
new file mode 100644
index 000000000000..18a356aed1ae
--- /dev/null
+++ b/qt5-qtwebkit-angle-build-fix.patch
@@ -0,0 +1,11 @@
+--- Source/WebCore/WebCore.pri.orig	2013-01-05 01:39:51.909266162 +0100
++++ Source/WebCore/WebCore.pri	2013-01-05 01:39:55.803294288 +0100
+@@ -210,7 +210,7 @@
+ 
+ use?(3D_GRAPHICS) {
+     win32: {
+-        win32-g++: {
++        win32-g++*: {
+             # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
+             contains(QT_CONFIG, opengles2) {
+                 LIBS += $$QMAKE_LIBS_OPENGL_ES2
diff --git a/qt5-qtwebkit-commit-5742b32.patch b/qt5-qtwebkit-commit-5742b32.patch
new file mode 100644
index 000000000000..e1554479c6f4
--- /dev/null
+++ b/qt5-qtwebkit-commit-5742b32.patch
@@ -0,0 +1,181 @@
+From 5742b3288b2494d03149f439182a189ba9330a47 Mon Sep 17 00:00:00 2001
+From: Pierre Rossi <pierre.rossi@digia.com>
+Date: Mon, 3 Dec 2012 15:16:56 +0100
+Subject: [PATCH] [Qt] Use a separate QWEBKITWIDGETS_EXPORT macro for WebKitWidgets
+
+https://bugs.webkit.org/show_bug.cgi?id=103844
+
+Patch by Pierre Rossi <pierre.rossi@digia.com> on 2012-12-03
+Reviewed by Simon Hausmann.
+
+Let's follow the common practice and have one export macro per library.
+We can't rely on BUILDING_WEBKIT anymore in that case, so we use the
+qmake defines instead.
+
+* Api/qwebkitglobal.h: Updated the import/export logic.
+* WidgetApi/qgraphicswebview.h: s/QWEBKIT/QWEBKITWIDGETS/
+* WidgetApi/qwebframe.h: Ditto.
+* WidgetApi/qwebinspector.h: Ditto.
+* WidgetApi/qwebpage.h: Ditto.
+* WidgetApi/qwebview.h: Ditto.
+* WidgetSupport/InitWebKitQt.cpp:
+(WebKit::initializeWebKitWidgets): use QWEBKITWIDGETS_EXPORT.
+* WidgetSupport/InitWebKitQt.h:
+(WebKit): Ditto.
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136394 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+Change-Id: I0030f2f17cddd66aedf24f29323579174e838303
+Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
+---
+ Source/WebKit/qt/Api/qwebkitglobal.h            |    8 +++++++-
+ Source/WebKit/qt/ChangeLog                      |   22 ++++++++++++++++++++++
+ Source/WebKit/qt/WidgetApi/qgraphicswebview.h   |    2 +-
+ Source/WebKit/qt/WidgetApi/qwebframe.h          |    4 ++--
+ Source/WebKit/qt/WidgetApi/qwebinspector.h      |    2 +-
+ Source/WebKit/qt/WidgetApi/qwebpage.h           |    4 ++--
+ Source/WebKit/qt/WidgetApi/qwebview.h           |    2 +-
+ Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp |    2 +-
+ Source/WebKit/qt/WidgetSupport/InitWebKitQt.h   |    4 +++-
+ 9 files changed, 40 insertions(+), 10 deletions(-)
+
+diff --git a/Source/WebKit/qt/Api/qwebkitglobal.h b/Source/WebKit/qt/Api/qwebkitglobal.h
+index 1d61182..5b866be 100644
+--- a/Source/WebKit/qt/Api/qwebkitglobal.h
++++ b/Source/WebKit/qt/Api/qwebkitglobal.h
+@@ -27,13 +27,19 @@
+ #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
+ 
+ #ifndef QT_STATIC
+-#  if defined(BUILDING_WEBKIT)
++#  if defined(QT_BUILD_WEBKIT_LIB)
+ #      define QWEBKIT_EXPORT Q_DECL_EXPORT
+ #  else
+ #      define QWEBKIT_EXPORT Q_DECL_IMPORT
+ #  endif
++#  if defined(QT_BUILD_WEBKITWIDGETS_LIB)
++#      define QWEBKITWIDGETS_EXPORT Q_DECL_EXPORT
++#  else
++#      define QWEBKITWIDGETS_EXPORT Q_DECL_IMPORT
++#  endif
+ #else
+ #  define QWEBKIT_EXPORT
++#  define QWEBKIT_EXPORT
+ #endif
+ 
+ QWEBKIT_EXPORT QString qWebKitVersion();
+diff --git a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
+index 5c5b666..c9e61f7 100644
+--- a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
++++ b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
+@@ -37,7 +37,7 @@ class QWebSettings;
+ 
+ class QGraphicsWebViewPrivate;
+ 
+-class QWEBKIT_EXPORT QGraphicsWebView : public QGraphicsWidget {
++class QWEBKITWIDGETS_EXPORT QGraphicsWebView : public QGraphicsWidget {
+     Q_OBJECT
+ 
+     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
+diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.h b/Source/WebKit/qt/WidgetApi/qwebframe.h
+index f3676fe..481d019 100644
+--- a/Source/WebKit/qt/WidgetApi/qwebframe.h
++++ b/Source/WebKit/qt/WidgetApi/qwebframe.h
+@@ -63,7 +63,7 @@ class QWebFrameData;
+ class QWebHitTestResultPrivate;
+ class QWebFrame;
+ 
+-class QWEBKIT_EXPORT QWebHitTestResult {
++class QWEBKITWIDGETS_EXPORT QWebHitTestResult {
+ public:
+     QWebHitTestResult();
+     QWebHitTestResult(const QWebHitTestResult &other);
+@@ -104,7 +104,7 @@ private:
+     friend class QWebPage;
+ };
+ 
+-class QWEBKIT_EXPORT QWebFrame : public QObject {
++class QWEBKITWIDGETS_EXPORT QWebFrame : public QObject {
+     Q_OBJECT
+     Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
+     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
+diff --git a/Source/WebKit/qt/WidgetApi/qwebinspector.h b/Source/WebKit/qt/WidgetApi/qwebinspector.h
+index 3733129..c333fa2 100644
+--- a/Source/WebKit/qt/WidgetApi/qwebinspector.h
++++ b/Source/WebKit/qt/WidgetApi/qwebinspector.h
+@@ -27,7 +27,7 @@
+ 
+ class QWebInspectorPrivate;
+ 
+-class QWEBKIT_EXPORT QWebInspector : public QWidget {
++class QWEBKITWIDGETS_EXPORT QWebInspector : public QWidget {
+     Q_OBJECT
+ public:
+     QWebInspector(QWidget* parent = 0);
+diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.h b/Source/WebKit/qt/WidgetApi/qwebpage.h
+index 5624b49..6aa303b 100644
+--- a/Source/WebKit/qt/WidgetApi/qwebpage.h
++++ b/Source/WebKit/qt/WidgetApi/qwebpage.h
+@@ -65,7 +65,7 @@ namespace WebCore {
+     struct FrameLoadRequest;
+ }
+ 
+-class QWEBKIT_EXPORT QWebPage : public QObject {
++class QWEBKITWIDGETS_EXPORT QWebPage : public QObject {
+     Q_OBJECT
+ 
+     Q_PROPERTY(bool modified READ isModified)
+@@ -213,7 +213,7 @@ public:
+         Geolocation
+     };
+ 
+-    class QWEBKIT_EXPORT ViewportAttributes {
++    class QWEBKITWIDGETS_EXPORT ViewportAttributes {
+     public:
+         ViewportAttributes();
+         ViewportAttributes(const QWebPage::ViewportAttributes& other);
+diff --git a/Source/WebKit/qt/WidgetApi/qwebview.h b/Source/WebKit/qt/WidgetApi/qwebview.h
+index 701fb36..43439df 100644
+--- a/Source/WebKit/qt/WidgetApi/qwebview.h
++++ b/Source/WebKit/qt/WidgetApi/qwebview.h
+@@ -38,7 +38,7 @@ class QWebPage;
+ class QWebViewPrivate;
+ class QWebNetworkRequest;
+ 
+-class QWEBKIT_EXPORT QWebView : public QWidget {
++class QWEBKITWIDGETS_EXPORT QWebView : public QWidget {
+     Q_OBJECT
+     Q_PROPERTY(QString title READ title)
+     Q_PROPERTY(QUrl url READ url WRITE setUrl)
+diff --git a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp
+index 7188603..8d26375 100644
+--- a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp
++++ b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp
+@@ -30,7 +30,7 @@
+ 
+ namespace WebKit {
+ 
+-Q_DECL_EXPORT void initializeWebKitWidgets()
++QWEBKITWIDGETS_EXPORT void initializeWebKitWidgets()
+ {
+     static bool initialized = false;
+     if (initialized)
+diff --git a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h
+index fbb2d18..772c960 100644
+--- a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h
++++ b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.h
+@@ -21,9 +21,11 @@
+ #ifndef InitWebKitQt_h
+ #define InitWebKitQt_h
+ 
++#include <qwebkitglobal.h>
++
+ namespace WebKit {
+ 
+-Q_DECL_EXPORT void initializeWebKitWidgets();
++QWEBKITWIDGETS_EXPORT void initializeWebKitWidgets();
+ 
+ }
+ #endif
+-- 
+1.7.1
+
diff --git a/qt5-qtwebkit-commit-b8c97e702.patch b/qt5-qtwebkit-commit-b8c97e702.patch
new file mode 100644
index 000000000000..f0efb8efcc04
--- /dev/null
+++ b/qt5-qtwebkit-commit-b8c97e702.patch
@@ -0,0 +1,30 @@
+From b8c97e702b56c60fdbd7f72add58a18a9743bf48 Mon Sep 17 00:00:00 2001
+From: Pierre Rossi <pierre.rossi@digia.com>
+Date: Tue, 4 Dec 2012 14:27:24 +0100
+Subject: [PATCH] [Qt] Yet another unreviewed speculative windows build fix.
+
+WebKit2 relies on the QWEBKIT_EXPORT macro from WebKit1 as well.
+
+* Api/qwebkitglobal.h:
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136495 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+Change-Id: Iadd377b766f7282688abaa6c51c94d486dbb8edd
+Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
+---
+ Source/WebKit/qt/Api/qwebkitglobal.h |    2 +-
+ Source/WebKit/qt/ChangeLog           |    8 ++++++++
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/Source/WebKit/qt/Api/qwebkitglobal.h b/Source/WebKit/qt/Api/qwebkitglobal.h
+index 6ee30ca..44e4d45 100644
+--- a/Source/WebKit/qt/Api/qwebkitglobal.h
++++ b/Source/WebKit/qt/Api/qwebkitglobal.h
+@@ -27,7 +27,7 @@
+ #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
+ 
+ #ifndef QT_STATIC
+-#  if defined(QT_BUILD_WEBKIT_LIB)
++#  if !defined(QT_BUILD_WEBKITWIDGETS_LIB) && defined(BUILDING_WEBKIT)
+ #      define QWEBKIT_EXPORT Q_DECL_EXPORT
+ #  else
+ #      define QWEBKIT_EXPORT Q_DECL_IMPORT
diff --git a/qt5-qtwebkit-disable-3d-graphics-support.patch b/qt5-qtwebkit-disable-3d-graphics-support.patch
new file mode 100644
index 000000000000..59011b970a9f
--- /dev/null
+++ b/qt5-qtwebkit-disable-3d-graphics-support.patch
@@ -0,0 +1,22 @@
+--- Tools/qmake/mkspecs/features/features.prf.orig	2013-01-04 22:56:13.465133221 +0100
++++ Tools/qmake/mkspecs/features/features.prf	2013-01-04 22:56:39.458319734 +0100
+@@ -81,7 +81,7 @@
+     # Disable on Windows CE for now, as ANGLE won't compile.
+     !wince*:contains(QT_CONFIG, opengl) {
+         # On Windows we require GLES2/EGL through ANGLE.
+-        !win32|contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_3d_graphics
++        #!win32|contains(QT_CONFIG, opengles2): WEBKIT_CONFIG += use_3d_graphics
+     }
+ 
+     # Temporarily disable FTPDIR on Windows CE (missing functions from time.h)
+--- Tools/Scripts/webkitperl/FeatureList.pm.orig	2013-01-04 23:07:11.449912367 +0100
++++ Tools/Scripts/webkitperl/FeatureList.pm	2013-01-04 23:07:21.360989539 +0100
+@@ -149,7 +149,7 @@
+ 
+ my @features = (
+     { option => "3d-rendering", desc => "Toggle 3D Rendering support",
+-      define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit() || isQt()), value => \$threeDRenderingSupport },
++      define => "ENABLE_3D_RENDERING", default => (isAppleMacWebKit()), value => \$threeDRenderingSupport },
+ 
+     { option => "accelerated-2d-canvas", desc => "Toggle Accelerated 2D Canvas support",
+       define => "ENABLE_ACCELERATED_2D_CANVAS", default => 0, value => \$accelerated2DCanvasSupport },
diff --git a/qt5-qtwebkit-dont-depend-on-icu.patch b/qt5-qtwebkit-dont-depend-on-icu.patch
index 1226704b4f6f..1a72e9a9fe6a 100644
--- a/qt5-qtwebkit-dont-depend-on-icu.patch
+++ b/qt5-qtwebkit-dont-depend-on-icu.patch
@@ -1,6 +1,6 @@
 --- qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/configure.prf.orig	2013-01-04 18:56:36.785550268 +0100
 +++ qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/configure.prf	2013-01-04 18:58:20.047373664 +0100
-@@ -115,9 +115,9 @@
+@@ -120,9 +120,9 @@
      }
  
      # Sanity checks that would prevent us from building the whole project altogether.
@@ -10,8 +10,8 @@
 +#    !android:!mac:!config_icu {
 +#       addReasonForSkippingBuild("ICU is required.")
 +#    }
-     production_build:blackberry|qnx {
-         addReasonForSkippingBuild("Build not supported on BB10/QNX yet.")
+     production_build:blackberry {
+         addReasonForSkippingBuild("Build not supported on BB10 yet.")
      }
 --- qtwebkit-opensource-src-5.0.0/Source/WTF/wtf/Platform.h.orig	2013-01-04 19:28:53.735934784 +0100
 +++ qtwebkit-opensource-src-5.0.0/Source/WTF/wtf/Platform.h	2013-01-04 19:28:13.856641177 +0100
diff --git a/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch b/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch
index 2a12fca270ea..2330ee5b12d9 100644
--- a/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch
+++ b/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch
@@ -1,11 +1,9 @@
 --- qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h.orig	2014-12-29 22:48:34.532357391 +0100
 +++ qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h	2014-12-29 23:01:26.254334924 +0100
-@@ -34,14 +34,15 @@
- #elif PLATFORM(WIN)
+@@ -35,13 +35,14 @@
  #include "GLSLANG/ShaderLang.h"
  #else
--#include "ShaderLang.h"
-+#include "GLSLANG/ShaderLang.h"
+ #include "ShaderLang.h"
 +#include "angle_gl.h"
  #endif
  
diff --git a/qt5-qtwebkit-use-correct-icu-libs.patch b/qt5-qtwebkit-use-correct-icu-libs.patch
new file mode 100644
index 000000000000..e686d247c519
--- /dev/null
+++ b/qt5-qtwebkit-use-correct-icu-libs.patch
@@ -0,0 +1,11 @@
+--- qtwebkit-opensource-src-5.4.1/Source/WTF/WTF.pri.icu	2015-03-23 19:21:26.013831236 +0100
++++ qtwebkit-opensource-src-5.4.1/Source/WTF/WTF.pri	2015-03-23 19:22:46.668582720 +0100
+@@ -14,7 +14,7 @@
+     INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
+     LIBS += -licucore
+ } else:!use?(wchar_unicode): {
+-    win32 {
++    win32:!mingw {
+         CONFIG(static, static|shared) {
+             CONFIG(debug, debug|release) {
+                 LIBS += -lsicuind -lsicuucd -lsicudtd
diff --git a/qt5-qtwebkit-use-linux-shell.patch b/qt5-qtwebkit-use-linux-shell.patch
new file mode 100644
index 000000000000..0312d6cd59ba
--- /dev/null
+++ b/qt5-qtwebkit-use-linux-shell.patch
@@ -0,0 +1,11 @@
+--- qtwebkit-opensource-src-5.5.0/Tools/qmake/mkspecs/features/default_pre.prf.orig	2015-08-08 00:28:12.099889263 +0200
++++ qtwebkit-opensource-src-5.5.0/Tools/qmake/mkspecs/features/default_pre.prf	2015-08-08 00:28:34.329126204 +0200
+@@ -37,7 +37,7 @@
+ }
+ 
+ # Try to detect if we're running under Windows cmd.exe or not
+-win32:isEmpty(MINGW_IN_SHELL): CONFIG += win_cmd_shell
++win32:!mingw:isEmpty(MINGW_IN_SHELL): CONFIG += win_cmd_shell
+ 
+ # Default location of generated sources
+ GENERATED_SOURCES_DESTDIR = generated
diff --git a/qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch b/qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch
index 12b9ecde90f1..d40c5457623e 100644
--- a/qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch
+++ b/qt5-qtwebkit-workaround-build-breakage-after-svn-commit-136242.patch
@@ -1,8 +1,8 @@
 --- Source/WebKit/qt/Api/qwebkitglobal.h.orig	2013-01-06 19:14:49.225087412 +0100
 +++ Source/WebKit/qt/Api/qwebkitglobal.h	2013-01-06 19:15:02.498182976 +0100
-@@ -26,7 +26,6 @@
- 
- #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
+@@ -24,7 +24,6 @@
+ #include <QtCore/qglobal.h>
+ #include <QtCore/qstring.h>
  
 -#ifndef QT_STATIC
  #  if !defined(QT_BUILD_WEBKITWIDGETS_LIB) && defined(BUILDING_WEBKIT)
diff --git a/webkit-commit-142567.patch b/webkit-commit-142567.patch
new file mode 100644
index 000000000000..af8c3e8fac7a
--- /dev/null
+++ b/webkit-commit-142567.patch
@@ -0,0 +1,57 @@
+Index: trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp

+===================================================================

+--- trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp	(revision 136430)

++++ trunk/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp	(revision 142567)

+@@ -33,7 +33,14 @@

+ namespace WebCore {

+ 

+-inline static int getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo)

+-{

+-    int value = -1;

++// Temporary typedef to support an incompatible change in the ANGLE API.

++#if !defined(ANGLE_SH_VERSION) || ANGLE_SH_VERSION < 108

++typedef int ANGLEGetInfoType;

++#else

++typedef size_t ANGLEGetInfoType;

++#endif

++

++inline static ANGLEGetInfoType getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo)

++{

++    ANGLEGetInfoType value = 0;

+     ShGetInfo(compiler, shaderInfo, &value);

+     return value;

+@@ -56,13 +63,11 @@

+     }

+ 

+-    int numSymbols = getValidationResultValue(compiler, symbolType);

+-    if (numSymbols < 0)

+-        return false;

+-

+-    int maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType);

++    ANGLEGetInfoType numSymbols = getValidationResultValue(compiler, symbolType);

++

++    ANGLEGetInfoType maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType);

+     if (maxNameLength <= 1)

+         return false;

+ 

+-    int maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH);

++    ANGLEGetInfoType maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH);

+     if (maxMappedNameLength <= 1)

+         return false;

+@@ -72,7 +77,7 @@

+     Vector<char, 256> mappedNameBuffer(maxMappedNameLength);

+     

+-    for (int i = 0; i < numSymbols; ++i) {

++    for (ANGLEGetInfoType i = 0; i < numSymbols; ++i) {

+         ANGLEShaderSymbol symbol;

+-        int nameLength = -1;

++        ANGLEGetInfoType nameLength = 0;

+         switch (symbolType) {

+         case SH_ACTIVE_ATTRIBUTES:

+@@ -88,5 +93,5 @@

+             return false;

+         }

+-        if (nameLength <= 0)

++        if (!nameLength)

+             return false;

+