Date: Sunday, March 25, 2012 @ 08:38:48
Author: andrea
Revision: 154288
Fix build with gcc 4.7
Added:
qt/trunk/gcc47.patch
Modified:
qt/trunk/PKGBUILD
-+
PKGBUILD| 10 +++---
gcc47.patch | 27 +++
2 files changed, 34 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-25 10:43:43 UTC (rev 154287)
+++ PKGBUILD2012-03-25 12:38:48 UTC (rev 154288)
@@ -5,7 +5,7 @@
pkgbase=qt
pkgname=('qt' 'qt-private-headers')
pkgver=4.8.0
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
url='http://qt-project.org/'
license=('GPL3' 'LGPL')
@@ -21,7 +21,8 @@
'fix-qgraphicsscene-regression.patch'
'improved-filter-event.patch'
'qurl-backward-compatibility.patch'
-'improve-cups-support.patch')
+'improve-cups-support.patch'
+'gcc47.patch')
md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
'fc211414130ab2764132e7370f8e5caa'
'85179f5e0437514f8639957e1d8baf62'
@@ -30,7 +31,8 @@
'c2e91fc028250a590e76effe234468e2'
'444ebeb716d7c7379835efb8aa88e6c8'
'7bc255a36733d0fbc80c1902ade4beca'
- 'c439c7731c25387352d8453ca7574971')
+ 'c439c7731c25387352d8453ca7574971'
+ 'd8a0e81075b290ddc18ecd33b9b7ee22')
build() {
cd ${srcdir}/${_pkgfqn}
@@ -43,6 +45,8 @@
# (FS#28381) (KDEBUG#180051)
patch -p1 -i ${srcdir}/improve-cups-support.patch
+
+ patch -p1 -i ${srcdir}/gcc47.patch
export QT4DIR=${srcdir}/${_pkgfqn}
export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
Added: gcc47.patch
===
--- gcc47.patch (rev 0)
+++ gcc47.patch 2012-03-25 12:38:48 UTC (rev 154288)
@@ -0,0 +1,27 @@
+diff -up
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+---
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me
2012-01-24 11:24:14.729942043 +0100
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
2012-01-24 14:28:39.848109534 +0100
+@@ -57,9 +57,7 @@ namespace JSC {
+
+ class JSGlobalObject : public JSVariableObject {
+ protected:
+-using JSVariableObject::JSVariableObjectData;
+-
+-struct JSGlobalObjectData : public JSVariableObjectData {
++struct JSGlobalObjectData : public
JSVariableObject::JSVariableObjectData {
+ // We use an explicit destructor function pointer instead of a
+ // virtual destructor because we want to avoid adding a vtable
+ // pointer to this struct. Adding a vtable pointer would force the
+diff -up
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+---
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me
2012-01-24 11:40:07.167856677 +0100
qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
2012-01-24 14:28:34.640306629 +0100
+@@ -32,8 +32,7 @@ namespace JSC{
+
+ class JSStaticScopeObject : public JSVariableObject {
+ protected:
+-using JSVariableObject::JSVariableObjectData;
+-struct JSStaticScopeObjectData : public JSVariableObjectData {
++struct JSStaticScopeObjectData : public
JSVariableObject::JSVariableObjectData {
+ JSStaticScopeObjectData()
+ : JSVariableObjectData(symbolTable, registerStore + 1)
+ {
