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

2013-08-29 Thread Andrea Scarpino 
Date: Thursday, August 29, 2013 @ 13:40:10
  Author: andrea
Revision: 193720

Fix build and docs - Qt guys really don't want people to build their docs...

Added:
  qt5/trunk/bison3.patch
Modified:
  qt5/trunk/PKGBUILD

--+
 PKGBUILD |   21 ++---
 bison3.patch |   38 ++
 2 files changed, 56 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-29 11:16:07 UTC (rev 193719)
+++ PKGBUILD2013-08-29 11:40:10 UTC (rev 193720)
@@ -36,13 +36,15 @@
 _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=('697b7b8768ef8895e168366ab6b44760'
  'b2897dd6a2967bccf8f10e397aafee55'
  '9638a78e502719ef8fe5f8d10d0361a9'
  '188da8f4c87316e730ebf1c6217bf5a0'
  '322b419b16c75d4de0ee7ad0a246caa1'
- '92831f79144d5cb8121915423ba47575')
+ '92831f79144d5cb8121915423ba47575'
+ '6b162cd2bc104f0ae83ca039401be7bf')
 
 prepare() {
   cd ${_pkgfqn}
@@ -56,6 +58,10 @@
   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() {
@@ -62,7 +68,8 @@
   cd ${_pkgfqn}
 
   export QTDIR=${srcdir}/${_pkgfqn}
-  export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+  export 
LD_LIBRARY_PATH=${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}
+  export QT_PLUGIN_PATH=${QTDIR}/qtbase/plugins
 
   PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
 -prefix /usr \
@@ -83,6 +90,14 @@
 -reduce-relocations
 
   make
+
+  # Fix paths
+  find ${QTDIR} -name Makefile -exec sed -i 
s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g {} +
+  find ${QTDIR} -name Makefile.qmake-docs -exec sed -i 
s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g {} +
+  find ${QTDIR} -name Makefile -exec sed -i 
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g {} +
+  find ${QTDIR} -name Makefile.qmake-docs -exec sed -i 
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g {} +
+  sed -i 
s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g 
qtwebkit/Source/Makefile.api
+
   make docs
 }
 

Added: bison3.patch
===
--- bison3.patch(rev 0)
+++ bison3.patch2013-08-29 11:40:10 UTC (rev 193720)
@@ -0,0 +1,38 @@
+From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen allan.jen...@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.turco...@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
+

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

2013-08-28 Thread Andrea Scarpino 
Date: Wednesday, August 28, 2013 @ 17:36:27
  Author: andrea
Revision: 193707

Upstream release; add qt5-doc package back

Modified:
  qt5/trunk/PKGBUILD
Deleted:
  qt5/trunk/bison3.patch

--+
 PKGBUILD |   34 +-
 bison3.patch |   38 --
 2 files changed, 21 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-28 15:19:10 UTC (rev 193706)
+++ PKGBUILD2013-08-28 15:36:27 UTC (rev 193707)
@@ -4,6 +4,7 @@
 pkgbase=qt5
 pkgname=('qt5-base'
  'qt5-declarative'
+ 'qt5-doc'
  'qt5-graphicaleffects'
  'qt5-imageformats'
  'qt5-jsbackend'
@@ -19,8 +20,8 @@
  'qt5-webkit'
  'qt5-x11extras'
  'qt5-xmlpatterns')
-pkgver=5.1.0
-pkgrel=2
+pkgver=5.1.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -35,15 +36,13 @@
 _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'
-'bison3.patch')
-md5sums=('44a507beebef73eb364b5a2ec7bbe090'
+'use-python2.patch')
+md5sums=('697b7b8768ef8895e168366ab6b44760'
  'b2897dd6a2967bccf8f10e397aafee55'
  '9638a78e502719ef8fe5f8d10d0361a9'
  '188da8f4c87316e730ebf1c6217bf5a0'
  '322b419b16c75d4de0ee7ad0a246caa1'
- '92831f79144d5cb8121915423ba47575'
- '6b162cd2bc104f0ae83ca039401be7bf')
+ '92831f79144d5cb8121915423ba47575')
 
 prepare() {
   cd ${_pkgfqn}
@@ -57,10 +56,6 @@
   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() {
@@ -81,9 +76,7 @@
 -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
 -system-sqlite \
 -openssl-linked \
--nomake docs \
 -nomake examples \
--nomake tests \
 -no-rpath \
 -optimized-qmake \
 -dbus-linked \
@@ -90,6 +83,7 @@
 -reduce-relocations
 
   make
+  make docs
 }
 
 package_qt5-base() {
@@ -144,6 +138,20 @@
   done
 }
 
+package_qt5-doc() {
+  pkgdesc='A cross-platform application and UI framework (Documentation)'
+  depends=('qt5-base')
+#  arch=('any')
+  conflicts=('qt-doc')
+  replaces=('qt-doc')
+  provides=('qt-doc')
+  options=('docs')
+  groups=()
+
+  cd ${_pkgfqn}
+  make INSTALL_ROOT=${pkgdir} install_docs
+}
+
 package_qt5-jsbackend() {
   pkgdesc='A cross-platform application and UI framework (QtV8)'
   depends=('qt5-base')

Deleted: bison3.patch
===
--- bison3.patch2013-08-28 15:19:10 UTC (rev 193706)
+++ bison3.patch2013-08-28 15:36:27 UTC (rev 193707)
@@ -1,38 +0,0 @@
-From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen allan.jen...@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.turco...@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
-

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

2013-08-21 Thread Andrea Scarpino 
Date: Wednesday, August 21, 2013 @ 13:10:19
  Author: andrea
Revision: 193494

Fix build with bison 3.x; libmng rebuild

Added:
  qt5/trunk/bison3.patch
Modified:
  qt5/trunk/PKGBUILD

--+
 PKGBUILD |   12 +---
 bison3.patch |   38 ++
 2 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-21 10:23:53 UTC (rev 193493)
+++ PKGBUILD2013-08-21 11:10:19 UTC (rev 193494)
@@ -20,7 +20,7 @@
  'qt5-x11extras'
  'qt5-xmlpatterns')
 pkgver=5.1.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -35,13 +35,15 @@
 _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 @@
   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() {

Added: bison3.patch
===
--- bison3.patch(rev 0)
+++ bison3.patch2013-08-21 11:10:19 UTC (rev 193494)
@@ -0,0 +1,38 @@
+From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen allan.jen...@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.turco...@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
+