Thu Aug 29 03:04:08 PDT 2013

3 files changed, 49 insertions, 68 deletions

diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index 2e123b391..703664ac4 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189742 2013-07-06 18:49:32Z andrea $
+# $Id: PKGBUILD 193689 2013-08-28 00:06:10Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
@@ -20,10 +20,10 @@ pkgname=('qt5-base'
          'qt5-x11extras'
          'qt5-xmlpatterns')
 pkgver=5.1.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
+license=('GPL3' 'LGPL' 'FDL' 'custom')
 makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms'
             'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
             'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
@@ -35,13 +35,15 @@ options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
-        'use-python2.patch')
+        'use-python2.patch'
+        'bison3.patch')
 md5sums=('44a507beebef73eb364b5a2ec7bbe090'
          'b2897dd6a2967bccf8f10e397aafee55'
          '9638a78e502719ef8fe5f8d10d0361a9'
          '188da8f4c87316e730ebf1c6217bf5a0'
          '322b419b16c75d4de0ee7ad0a246caa1'
-         '92831f79144d5cb8121915423ba47575')
+         '92831f79144d5cb8121915423ba47575'
+         '6b162cd2bc104f0ae83ca039401be7bf')
 
 prepare() {
   cd ${_pkgfqn}
@@ -55,6 +57,10 @@ prepare() {
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py')
+
+  # Fix build with bison 3.x
+  cd qtwebkit
+  patch -p1 -i "${srcdir}"/bison3.patch
 }
 
 build() {
diff --git a/extra/qt5/bison3.patch b/extra/qt5/bison3.patch
new file mode 100644
index 000000000..4070c88e8
--- /dev/null
+++ b/extra/qt5/bison3.patch
@@ -0,0 +1,38 @@
+From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@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@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
+
diff --git a/extra/qt5/gcc48.patch b/extra/qt5/gcc48.patch
deleted file mode 100644
index 03b205b68..000000000
--- a/extra/qt5/gcc48.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-# Author:     David E. Narváez <david.narvaez@computer.org>
-# AuthorDate: 2013-02-23 23:14:50 -0500
-# Commit:     David E. Narváez <david.narvaez@computer.org>
-# CommitDate: 2013-02-23 23:14:50 -0500
-#
-# Rename qAbs Function for timeval
-#
-# This decouples it from qAbs which is declared as a constexpr under
-# certain compilation flags and enables for qtbase to be compiled with
-# GCC 4.8
-#
-# Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9
-diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp
-index 0eee425..7a29247 100644
---- a/src/corelib/kernel/qtimerinfo_unix.cpp
-+++ b/src/corelib/kernel/qtimerinfo_unix.cpp
-@@ -87,22 +87,21 @@
-     firstTimerInfo = 0;
- }
- 
- timeval QTimerInfoList::updateCurrentTime()
- {
-     return (currentTime = qt_gettime());
- }
- 
- #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED)
- 
--template <>
--timeval qAbs(const timeval &t)
-+timeval qAbsTimeval(const timeval &t)
- {
-     timeval tmp = t;
-     if (tmp.tv_sec < 0) {
-         tmp.tv_sec = -tmp.tv_sec - 1;
-         tmp.tv_usec -= 1000000;
-     }
-     if (tmp.tv_sec == 0 && tmp.tv_usec < 0) {
-         tmp.tv_usec = -tmp.tv_usec;
-     }
-     return normalizedTimeval(tmp);
-@@ -137,21 +136,21 @@
-     *delta = elapsedTime - elapsedTimeTicks;
- 
-     previousTicks = currentTicks;
-     previousTime = currentTime;
- 
-     // If tick drift is more than 10% off compared to realtime, we assume that the clock has
-     // been set. Of course, we have to allow for the tick granularity as well.
-     timeval tickGranularity;
-     tickGranularity.tv_sec = 0;
-     tickGranularity.tv_usec = msPerTick * 1000;
--    return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10);
-+    return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10);
- }
- 
- /*
-   repair broken timer
- */
- void QTimerInfoList::timerRepair(const timeval &diff)
- {
-     // repair all timers
-     for (int i = 0; i < size(); ++i) {
-         register QTimerInfo *t = at(i);