[SCM] QtWebKit packaging branch, master, updated. debian/2.2.1-7-53-g03fb5cb

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit.git;a=commitdiff;h=63dd43c

The following commit has been merged in the master branch:
commit 63dd43cd7362c92dee03a21119612b8ca1f8a334
Author: Andreas Cord-Landwehr <cola at uni-paderborn.de>
Date:   Sun Jun 8 10:13:08 2014 +0200

    New upstream build patch: upstream_changeset_119798.diff
---
 debian/changelog                              |  1 +
 debian/patches/series                         |  2 ++
 debian/patches/upstream_changeset_119798.diff | 12 ++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c68cedd..ac39d60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtwebkit (2.3.2-0) UNRELEASED; urgency=medium
     - remove upstream_changeset_r93631.diff, applied upstream
     - remove upstream_changeset_r113848.diff, applied upstream 
     - remove upstream_Build-fixes-for-glib-2.31.diff, applied upstream
+    - add build fix: upstream_changeset_119798.patch
   * Switch to building with ./Tools/Scripts/build-webkit as recommended
     by upstream
 
diff --git a/debian/patches/series b/debian/patches/series
index 7672e35..7d0940a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+# upstream patches
+upstream_changeset_119798.diff
 # debian patches
 01_lflags_as-needed.diff
 02_add_nostrip_for_debug_packages.diff
diff --git a/debian/patches/upstream_changeset_119798.diff b/debian/patches/upstream_changeset_119798.diff
new file mode 100644
index 0000000..1f6cf69
--- /dev/null
+++ b/debian/patches/upstream_changeset_119798.diff
@@ -0,0 +1,12 @@
+Origin: https://bugs.webkit.org/show_bug.cgi?id=119798
+Subversion Revision: 154045
+--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
++++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -47,6 +47,7 @@
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+ 
+ %union {
+     struct {

-- 
QtWebKit packaging