[SCM] qt5webkit packaging branch, master, updated. debian/5.1.1-1-2-gf9a9498

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit f9a9498487a7c3183dfc2696ee04db71a4e750b1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Dec 22 23:29:01 2013 +0400

    Backport upstream patch that fixes build failure with bison 3.
    
    Closes: #731979.
---
 debian/changelog                   |  3 +++
 debian/patches/glslang_bison3.diff | 14 ++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 282d55c..6842e2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtwebkit-opensource-src (5.1.1-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Backport upstream patch (glslang_bison3.diff) to fix build failure
+    with bison 3 (closes: #731979).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 22 Dec 2013 23:26:30 +0400
 
diff --git a/debian/patches/glslang_bison3.diff b/debian/patches/glslang_bison3.diff
new file mode 100644
index 0000000..3a0712d
--- /dev/null
+++ b/debian/patches/glslang_bison3.diff
@@ -0,0 +1,14 @@
+Description: fix build failure with new bison
+Origin: upstream, https://qt.gitorious.org/qt/qtwebkit/commit/60ba8bd5b3575d
+Last-Update: 2013-12-22
+
+--- 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 {
diff --git a/debian/patches/series b/debian/patches/series
index 68f3936..d58b441 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ stabs_format_debug_info.diff
 no_gc_sections.diff
 hurd.diff
 webkit_qt_hide_symbols.diff
+glslang_bison3.diff

-- 
qt5webkit packaging