[arch-commits] Commit in qtwebkit/trunk (PKGBUILD bison3.patch qwebview.patch)

[Andrea Scarpino]

    Date: Monday, October 14, 2013 @ 20:08:12
  Author: andrea
Revision: 196522

upgpkg: qtwebkit 2.3.3-1

Upstream release

Added:
  qtwebkit/trunk/bison3.patch
Modified:
  qtwebkit/trunk/PKGBUILD
  qtwebkit/trunk/qwebview.patch

----------------+
 PKGBUILD       |   29 ++++++++++++++++++-----------
 bison3.patch   |   38 ++++++++++++++++++++++++++++++++++++++
 qwebview.patch |    4 ++--
 3 files changed, 58 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-14 18:08:00 UTC (rev 196521)
+++ PKGBUILD	2013-10-14 18:08:12 UTC (rev 196522)
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qtwebkit
-pkgver=2.3.2
+pkgver=2.3.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://trac.webkit.org/wiki/QtWebKit'
@@ -12,20 +12,29 @@
 makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
 conflicts=('qt<4.8')
 _qtver=4.8.5
-source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver}"
+source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         "http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-${_qtver}.tar.gz"
         'use-python2.patch'
+        'bison3.patch'
         'qwebview.patch')
-sha1sums=('adf66bc92b0c3e41791a419c6b776d0167acaa7c'
+sha1sums=('64f3ab7f8e53b5b971a3a6577fc61db0cc2ea31f'
           '745f9ebf091696c0d5403ce691dc28c039d77b9e'
           '315b6ff603f35e5492a036f7082f6aa075dfb607'
-          'ef467fcfc9e74aa88356f27acc21792706ed1e4d')
+          'd2c6182512e4bcbdf30a9e9d513c52fe4b16d9f2'
+          '88ed73e6bd7ea9c6d227ceaed0ff2f1cf0200667')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/use-python2.patch
+  patch -p1 -i "${srcdir}"/bison3.patch
+  
+  cd ../qt-everywhere-opensource-src-${_qtver}
+  patch -p1 -i "${srcdir}"/qwebview.patch
+}
+
 build() {
-  cd webkit-qtwebkit-23
+  cd ${pkgname}-${pkgver}
 
-  patch -p1 -i "${srcdir}"/use-python2.patch
-
   OPTS="--no-webkit2"
   if [ "${CARCH}" = "i686" ]; then
       # FS#33418
@@ -40,15 +49,13 @@
     ${OPTS}
 
   # Build the QWebView plugin (FS#27914)
-  cd ../qt-everywhere-opensource-src-${_qtver}
-  patch -p1 -i "${srcdir}"/qwebview.patch
-  cd tools/designer/src/plugins/qwebview
+  cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
   qmake-qt4
   make
 }
 
 package() {
-  cd webkit-qtwebkit-23
+  cd ${pkgname}-${pkgver}
   make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
 
   cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview

Added: bison3.patch
===================================================================
--- bison3.patch	                        (rev 0)
+++ bison3.patch	2013-10-14 18:08:12 UTC (rev 196522)
@@ -0,0 +1,38 @@
+From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen at digia.com>
+Date: Fri, 16 Aug 2013 18:27:07 +0200
+Subject: [PATCH] ANGLE doesn't build with bison 3.0
+
+https://bugs.webkit.org/show_bug.cgi?id=119798
+
+Reviewed by Antti Koivisto.
+
+Make glslang.y compatible with bison 3.0
+by using %lex-param to set YYLEX_PARAM.
+
+* src/compiler/glslang.y:
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+Task-number: QTBUG-32913
+Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
+Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte at digia.com>
+---
+ Source/ThirdParty/ANGLE/src/compiler/glslang.y |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+index 3cad335..b41e95a 100644
+--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
++++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+ 
+ %union {
+     struct {
+-- 
+1.7.1
+

Modified: qwebview.patch
===================================================================
--- qwebview.patch	2013-10-14 18:08:00 UTC (rev 196521)
+++ qwebview.patch	2013-10-14 18:08:12 UTC (rev 196522)
@@ -1,8 +1,8 @@
 --- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~	2013-01-09 12:56:08.915412090 +0000
 +++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri	2013-01-09 12:58:06.911391299 +0000
 @@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include
-+LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib
++INCLUDEPATH += ../../../../../../qtwebkit-2.3.3/WebKitBuild/Release/include
++LIBS += -L../../../../../../qtwebkit-2.3.3/WebKitBuild/Release/lib
 +
  CONFIG += designer
  win32|mac: CONFIG+= debug_and_release