updated patch for compatibility with latest ANGLE

- rebuild ANGLE first because this needed to be fixed as well
- removed unused patches by the way

10 files changed, 153 insertions, 538 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50547e02e4d8..4a06b7c0b404 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Feb  4 13:39:09 UTC 2016
+# Thu Mar 10 19:13:19 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 = 1
+	pkgrel = 2
 	url = https://www.qt.io/
 	arch = any
 	groups = mingw-w64-qt
@@ -32,11 +32,6 @@ pkgbase = mingw-w64-qt5-webkit
 	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 = 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 = qt5-qtwebkit-enable-pkgconfig-support-for-win32-target.patch
 	source = qt5-qtwebkit-fix-compatibility-with-latest-angle.patch
@@ -46,24 +41,17 @@ pkgbase = mingw-w64-qt5-webkit
 	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
 	md5sums = 681328edb539b8fa3a273b38c90b3e31
-	md5sums = 445ada3000f0cc1279204b7a3efc3b4c
-	md5sums = bc1943fb276964f710b4e9f5f08bb2ec
-	md5sums = 645c05f212fcd9f310798f7eacd9abd4
-	md5sums = 87458f3ebb61bf598e4fce10ab1ccbb7
-	md5sums = b227653519ee0ea5d388bd58a21b6d66
 	md5sums = ce7d257e2b5b94fe3affd98f52d99d09
 	md5sums = ac574de962545d6a9e975b4db63c3e09
-	md5sums = 7038206bfef2aea594f10af3bda90220
+	md5sums = 4ad37c7d4dda8e77bb0a25c671f79adc
 	md5sums = 228f28df2b10e417a325176f7878ebe1
 	md5sums = 680fe925113911f6b6c36946d7294cbd
 	md5sums = 18b21fd8e9517f48db7748544d2aa92f
 	md5sums = f452210683386f9c28f04d7dea0ecfc7
 	md5sums = 6aba6468efafb64943887079e258b799
 	md5sums = 4e374836f26853b4d82be0e87aa584a5
-	md5sums = eaac9af299b50c2f03f4c322123e6e62
 	md5sums = c36fe581e0f3b61cef19415782b257ca
 
 pkgname = mingw-w64-qt5-webkit
diff --git a/PKGBUILD b/PKGBUILD
index ce8cb8171912..3a7bc68901f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: ant32 <antreimer@gmail.com>
+# Maintainer: Martchus <martchus@gmx.net>
+# Contributor: ant32 <antreimer@gmail.com>
 # Contributor: Filip Brcic <brcha@gna.org>
 
 _qt_module=qtwebkit
 pkgname=mingw-w64-qt5-webkit
 pkgver=5.5.1
-pkgrel=1
+pkgrel=2
 arch=(any)
 pkgdesc="Classes for a WebKit2 based implementation and a new QML API (mingw-w64)"
 depends=('mingw-w64-qt5-base'
@@ -28,11 +29,6 @@ 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
@@ -42,24 +38,17 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub
         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'
+         '4ad37c7d4dda8e77bb0a25c671f79adc'
          '228f28df2b10e417a325176f7878ebe1'
          '680fe925113911f6b6c36946d7294cbd'
          '18b21fd8e9517f48db7748544d2aa92f'
          'f452210683386f9c28f04d7dea0ecfc7'
          '6aba6468efafb64943887079e258b799'
          '4e374836f26853b4d82be0e87aa584a5'
-         'eaac9af299b50c2f03f4c322123e6e62'
          'c36fe581e0f3b61cef19415782b257ca')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -79,7 +68,7 @@ prepare() {
   # 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.
+  # qt5-webkit depends on qt5-base 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.
@@ -103,8 +92,8 @@ prepare() {
   # 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 
+  # 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
@@ -127,8 +116,13 @@ build() {
     # from system ANGLE can be included
     export 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 ../WebKit.pro
+    ${_arch}-qmake-qt5 \
+      QMAKE_CXXFLAGS+=-Wno-c++0x-compat \
+      DEFINES+=SH_GLSL_OUTPUT=SH_GLSL_COMPATIBILITY_OUTPUT \
+      ../WebKit.pro
     make
     popd
   done
diff --git a/PKGBUILD.bak b/PKGBUILD.bak
deleted file mode 100644
index f5215af06bd3..000000000000
--- a/PKGBUILD.bak
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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
deleted file mode 100644
index 98c3ac1de170..000000000000
--- a/qt5-angleproject-dont-use-winflex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 18a356aed1ae..000000000000
--- a/qt5-qtwebkit-angle-build-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index e1554479c6f4..000000000000
--- a/qt5-qtwebkit-commit-5742b32.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-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
deleted file mode 100644
index f0efb8efcc04..000000000000
--- a/qt5-qtwebkit-commit-b8c97e702.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index 59011b970a9f..000000000000
--- a/qt5-qtwebkit-disable-3d-graphics-support.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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-fix-compatibility-with-latest-angle.patch b/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch
index 2330ee5b12d9..d20ba2c0d83e 100644
--- a/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch
+++ b/qt5-qtwebkit-fix-compatibility-with-latest-angle.patch
@@ -1,5 +1,5 @@
---- 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
+--- qtwebkit-opensource-src-5.5.1/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h.orig	2015-10-13 06:37:18.000000000 +0200
++++ qtwebkit-opensource-src-5.5.1/Source/WebCore/platform/graphics/ANGLEWebKitBridge.h	2016-03-09 17:17:26.000000000 +0100
 @@ -35,13 +35,14 @@
  #include "GLSLANG/ShaderLang.h"
  #else
@@ -40,55 +40,127 @@
      }
  };
  
---- qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp.orig	2014-12-29 23:37:30.636783007 +0100
-+++ qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp	2014-12-30 12:00:39.524299653 +0100
-@@ -42,7 +42,7 @@
- inline static ANGLEGetInfoType getValidationResultValue(const ShHandle compiler, ShShaderInfo shaderInfo)
- {
-     ANGLEGetInfoType value = 0;
--    ShGetInfo(compiler, shaderInfo, &value);
-+    ShGetInfo(compiler, (ShShaderInfo) shaderInfo, &value);
-     return value;
- }
+--- qtwebkit-opensource-src-5.5.1/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp.orig	2015-10-13 06:37:17.000000000 +0200
++++ qtwebkit-opensource-src-5.5.1/Source/WebCore/platform/graphics/ANGLEWebKitBridge.cpp	2016-03-09 20:45:20.000000000 +0100
+@@ -32,98 +32,25 @@
  
-@@ -51,11 +51,11 @@
-     ShShaderInfo symbolMaxNameLengthType;
+ namespace WebCore {
  
-     switch (symbolType) {
+-// 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;
+-}
+-
+-static bool getSymbolInfo(ShHandle compiler, ShShaderInfo symbolType, Vector<ANGLEShaderSymbol>& symbols)
+-{
+-    ShShaderInfo symbolMaxNameLengthType;
+-
+-    switch (symbolType) {
 -    case SH_ACTIVE_ATTRIBUTES:
 -        symbolMaxNameLengthType = SH_ACTIVE_ATTRIBUTE_MAX_LENGTH;
-+    case GL_ACTIVE_ATTRIBUTES:
-+        symbolMaxNameLengthType = (ShShaderInfo) GL_ACTIVE_ATTRIBUTE_MAX_LENGTH;
-         break;
+-        break;
 -    case SH_ACTIVE_UNIFORMS:
 -        symbolMaxNameLengthType = SH_ACTIVE_UNIFORM_MAX_LENGTH;
-+    case GL_ACTIVE_UNIFORMS:
-+        symbolMaxNameLengthType = (ShShaderInfo) GL_ACTIVE_UNIFORM_MAX_LENGTH;
-         break;
-     default:
-         ASSERT_NOT_REACHED();
-@@ -79,14 +79,16 @@
-     for (ANGLEGetInfoType i = 0; i < numSymbols; ++i) {
+-        break;
+-    default:
+-        ASSERT_NOT_REACHED();
++template<typename vectype>
++bool readSymbols(const vectype *vec, Vector<ANGLEShaderSymbol> &symbols) {
++    if(!vec) {
+         return false;
+     }
+-
+-    ANGLEGetInfoType numSymbols = getValidationResultValue(compiler, symbolType);
+-
+-    ANGLEGetInfoType maxNameLength = getValidationResultValue(compiler, symbolMaxNameLengthType);
+-    if (maxNameLength <= 1)
+-        return false;
+-
+-    ANGLEGetInfoType maxMappedNameLength = getValidationResultValue(compiler, SH_MAPPED_NAME_MAX_LENGTH);
+-    if (maxMappedNameLength <= 1)
+-        return false;
+-
+-    // The maximum allowed symbol name length is 256 characters.
+-    Vector<char, 256> nameBuffer(maxNameLength);
+-    Vector<char, 256> mappedNameBuffer(maxMappedNameLength);
+-    
+-    for (ANGLEGetInfoType i = 0; i < numSymbols; ++i) {
++    for(typename vectype::const_iterator i = vec->begin(), end = vec->end(); i != end; ++i) {
          ANGLEShaderSymbol symbol;
-         ANGLEGetInfoType nameLength = 0;
-+        ShPrecisionType precision = SH_PRECISION_UNDEFINED;
-+        int staticUse = 0;
-         switch (symbolType) {
+-        ANGLEGetInfoType nameLength = 0;
+-        switch (symbolType) {
 -        case SH_ACTIVE_ATTRIBUTES:
-+        case GL_ACTIVE_ATTRIBUTES:
-             symbol.symbolType = SHADER_SYMBOL_TYPE_ATTRIBUTE;
+-            symbol.symbolType = SHADER_SYMBOL_TYPE_ATTRIBUTE;
 -            ShGetActiveAttrib(compiler, i, &nameLength, &symbol.size, &symbol.dataType, nameBuffer.data(), mappedNameBuffer.data());
-+            ShGetVariableInfo(compiler, SH_ACTIVE_ATTRIBUTES, i, &nameLength, &symbol.size, &symbol.dataType, &precision, &staticUse, nameBuffer.data(), mappedNameBuffer.data());
-             break;
+-            break;
 -        case SH_ACTIVE_UNIFORMS:
-+        case GL_ACTIVE_UNIFORMS:
-             symbol.symbolType = SHADER_SYMBOL_TYPE_UNIFORM;
+-            symbol.symbolType = SHADER_SYMBOL_TYPE_UNIFORM;
 -            ShGetActiveUniform(compiler, i, &nameLength, &symbol.size, &symbol.dataType, nameBuffer.data(), mappedNameBuffer.data());
-+            ShGetVariableInfo(compiler, SH_ACTIVE_UNIFORMS, i, &nameLength, &symbol.size, &symbol.dataType, &precision, &staticUse, nameBuffer.data(), mappedNameBuffer.data());
-             break;
-         default:
-             ASSERT_NOT_REACHED();
-@@ -170,8 +172,8 @@
+-            break;
+-        default:
+-            ASSERT_NOT_REACHED();
+-            return false;
+-        }
+-        if (!nameLength)
+-            return false;
+-        
+-        // The ShGetActive* calls above are guaranteed to produce null-terminated strings for
+-        // nameBuffer and mappedNameBuffer. Also, the character set for symbol names
+-        // is a subset of Latin-1 as specified by the OpenGL ES Shading Language, Section 3.1 and
+-        // WebGL, Section "Characters Outside the GLSL Source Character Set".
+-
+-        String name = String(nameBuffer.data());
+-        String mappedName = String(mappedNameBuffer.data());
+-        
+-        // ANGLE returns array names in the format "array[0]".
+-        // The only way to know if a symbol is an array is to check if it ends with "[0]".
+-        // We can't check the size because regular symbols and arrays of length 1 both have a size of 1.
+-        symbol.isArray = name.endsWith("[0]") && mappedName.endsWith("[0]");
+-        if (symbol.isArray) {
+-            // Add a symbol for the array name without the "[0]" suffix.
+-            name.truncate(name.length() - 3);
+-            mappedName.truncate(mappedName.length() - 3);
+-        }
+-
+-        symbol.name = name;
+-        symbol.mappedName = mappedName;
++        symbol.name = i->name.data();
++        symbol.mappedName = i->mappedName.data();
++        symbol.isArray = i->isArray();
+         symbols.append(symbol);
+-    
+         if (symbol.isArray) {
+             // Add symbols for each array element.
++            symbol.size = i->arraySize;
+             symbol.isArray = false;
+-            for (int i = 0; i < symbol.size; i++) {
+-                String arrayBrackets = "[" + String::number(i) + "]";
+-                symbol.name = name + arrayBrackets;
+-                symbol.mappedName = mappedName + arrayBrackets;
++            for (int index = 0; index < symbol.size; index++) {
++                String arrayBrackets = "[" + String::number(index) + "]";
++                symbol.name = i->name.data() + arrayBrackets;
++                symbol.mappedName = i->mappedName.data() + arrayBrackets;
+                 symbols.append(symbol);
+             }
+         }
+@@ -163,15 +90,14 @@
+ {
+     // Resources are (possibly) changing - cleanup compilers if we had them already
+     cleanupCompilers();
+-    
+     m_resources = resources;
+ }
+ 
  bool ANGLEWebKitBridge::compileShaderSource(const char* shaderSource, ANGLEShaderType shaderType, String& translatedShaderSource, String& shaderValidationLog, Vector<ANGLEShaderSymbol>& symbols, int extraCompileOptions)
  {
      if (!builtCompilers) {
@@ -99,29 +171,45 @@
          if (!m_fragmentCompiler || !m_vertexCompiler) {
              cleanupCompilers();
              return false;
-@@ -189,7 +191,7 @@
+@@ -189,31 +115,17 @@
  
      const char* const shaderSourceStrings[] = { shaderSource };
  
 -    bool validateSuccess = ShCompile(compiler, shaderSourceStrings, 1, SH_OBJECT_CODE | SH_ATTRIBUTES_UNIFORMS | extraCompileOptions);
 +    bool validateSuccess = ShCompile(compiler, shaderSourceStrings, 1, SH_OBJECT_CODE | SH_VARIABLES | extraCompileOptions);
      if (!validateSuccess) {
-         int logSize = getValidationResultValue(compiler, SH_INFO_LOG_LENGTH);
-         if (logSize > 1) {
-@@ -211,9 +213,9 @@
-         translatedShaderSource = translationBuffer.get();
+-        int logSize = getValidationResultValue(compiler, SH_INFO_LOG_LENGTH);
+-        if (logSize > 1) {
+-            OwnArrayPtr<char> logBuffer = adoptArrayPtr(new char[logSize]);
+-            if (logBuffer) {
+-                ShGetInfoLog(compiler, logBuffer.get());
+-                shaderValidationLog = logBuffer.get();
+-            }
+-        }
++        shaderValidationLog = ShGetInfoLog(compiler).data();
+         return false;
      }
+ 
+-    int translationLength = getValidationResultValue(compiler, SH_OBJECT_CODE_LENGTH);
+-    if (translationLength > 1) {
+-        OwnArrayPtr<char> translationBuffer = adoptArrayPtr(new char[translationLength]);
+-        if (!translationBuffer)
+-            return false;
+-        ShGetObjectCode(compiler, translationBuffer.get());
+-        translatedShaderSource = translationBuffer.get();
+-    }
++    translatedShaderSource = ShGetObjectCode(compiler).data();
      
 -    if (!getSymbolInfo(compiler, SH_ACTIVE_ATTRIBUTES, symbols))
-+    if (!getSymbolInfo(compiler, (ShShaderInfo) GL_ACTIVE_ATTRIBUTES, symbols))
++    if (!readSymbols(ShGetAttributes(compiler), symbols))
          return false;
 -    if (!getSymbolInfo(compiler, SH_ACTIVE_UNIFORMS, symbols))
-+    if (!getSymbolInfo(compiler, (ShShaderInfo) GL_ACTIVE_UNIFORMS, symbols))
++    if (!readSymbols(ShGetUniforms(compiler), symbols))
          return false;
  
      return true;
---- qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp.orig	2014-12-30 12:11:43.450097601 +0100
-+++ qtwebkit-opensource-src-5.4.0/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp	2014-12-30 12:13:46.812361166 +0100
+--- qtwebkit-opensource-src-5.5.1/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp.orig	2015-10-13 06:37:17.000000000 +0200
++++ qtwebkit-opensource-src-5.5.1/Source/WebCore/platform/graphics/opengl/Extensions3DOpenGLCommon.cpp	2016-03-09 17:17:26.000000000 +0100
 @@ -172,7 +172,7 @@
  
      String translatedShaderSource;
diff --git a/webkit-commit-142567.patch b/webkit-commit-142567.patch
deleted file mode 100644
index af8c3e8fac7a..000000000000
--- a/webkit-commit-142567.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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;

-