Fix build with gcc 4.7, bug 411803 by Andrew John Hughes.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 71 insertions, 12 deletions

diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index 6e5a71b0356b..2bfb1473ff50 100644
--- a/x11-libs/qt-script/ChangeLog
+++ b/x11-libs/qt-script/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-script
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.107 2012/04/05 15:39:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.108 2012/04/15 13:39:19 pesa Exp $
+
+  15 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/qt-script-4.8.1+gcc-4.7.patch, qt-script-4.8.1.ebuild:
+  Fix build with gcc 4.7, bug 411803 by Andrew John Hughes.
 
   05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-script-4.8.0.ebuild:
   Drop Qt-4.8.0
diff --git a/x11-libs/qt-script/Manifest b/x11-libs/qt-script/Manifest
index a8a35d5b0331..3a5c58892669 100644
--- a/x11-libs/qt-script/Manifest
+++ b/x11-libs/qt-script/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA512
 
 AUX qt-4.6-nolibx11.patch 1037 RMD160 a32338fa24ca2f99b0f3b679b1fabb88ac9b0ec1 SHA1 b7b2a430147a746a6a52f05a495be6262f2925ef SHA256 2b1d4e7df4918cafa50476e911f4c8e3e79e09fa702d756236ad2308e1c9bc69
+AUX qt-script-4.8.1+gcc-4.7.patch 2255 RMD160 fe45b8b73c59b22418b5e3916f99098492694e51 SHA1 a44d0503f54a5339d5d2113f020965d795076bf0 SHA256 57106ea4fc4df1a4ae7d06738faeae659fcbcc6d6d602a856a24f3ddcca7f0c2
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 RMD160 3e47b09663a89973b1c8628506c995dfc2a5387c SHA1 af9016aa924a577f7b06ffd28c9773b56d74c939 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e
@@ -9,17 +10,23 @@ DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 RMD160 538e626fae80ca8c
 EBUILD qt-script-4.6.3.ebuild 1295 RMD160 dfdd71e096bbd649542f8693f81ecfafe71e711d SHA1 00d993d009722c104e26f1b2c37f0133653b8be8 SHA256 af9441c63ab309b706b39cef9ddd9de15aee3be1d735658e76a5f6f63fd6fffc
 EBUILD qt-script-4.7.2.ebuild 1543 RMD160 956b08bb48be45f8285906836ca3201d8a048b30 SHA1 adcb54ad3139a7c6c0399e8dcddc8782d85f5326 SHA256 9a7dba65e70ee584fc52f8b70abd530a5c0fcf395f3551bb5f65f5fd75d3a919
 EBUILD qt-script-4.7.4.ebuild 1536 RMD160 06dc79a431199914a3bbc6852133c92562c2e748 SHA1 6dad69b68c7106e7b5b78df84af1bedfac67b0a9 SHA256 08f483c39ddffe70f5f9a99506d38e4c2b3447ee2c16b921d9e366b4e1be497d
-EBUILD qt-script-4.8.1.ebuild 1544 RMD160 4b666db94a227000bb040390591dd5e98adf1f41 SHA1 dea3fb9ba49e2c79a8df3c3a52c20734c303d8f4 SHA256 282a90d34ebc1da8be524639842b3fffdcdbddf683a05f45b7bb8e105082301d
-MISC ChangeLog 13336 RMD160 a98f8517005fdfa1af85a2eb7e462c32ea8726b5 SHA1 ebe9d5185572da234121cc6fb9926b0e1e86190a SHA256 3a31119e8b7236d307262423489661b0b3b067a9ccba388aea147534bbb707b5
+EBUILD qt-script-4.8.1.ebuild 1591 RMD160 535c68b7c6f1b93c0dc32f09eccb8504fa1af0ef SHA1 62a49485a387bbe82971030d12a610c573d2b2d8 SHA256 e52bb737927ebdc1c98019654f14e07aa0d1f80ff511eec9942ae78d19450cad
+MISC ChangeLog 13511 RMD160 1e85c5b7dc287ee542eef11a4480192df4b86e02 SHA1 799896f99652b7c0b18e17f001511010d71ceff2 SHA256 7175d982aa3a492c48aee4c4e9cfe5d5b472e00ac9b82282f25ff37916fcd326
 MISC metadata.xml 651 RMD160 93d9f9705ba01e489dccc7267ee8e2ff73d1f12d SHA1 4577a59a40be992cae42ff3cad9eff8df19364db SHA256 91ffa49bba21a3c5050cc38d149e7709cc982ad94824b2d14b6f25bed8635399
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPfby8AAoJEO+t9ga+3I3aQqgH/0Y1jIOWdX8TASC3LkRhbMEL
-tng38xWBsf1NmqW0KuwW4keTQBEBmLlidSFcdLz9BcmjJ9I1tNMoB/xJPKv3doHQ
-fKwGIjpgtnKR6pl2QDXbG77BF2n9OHbeZgvoB2lrstbzOmfrqxF04mQjEpJCBc7B
-QEe7znWk4cVJnIRi8+py+6byXe4+2dQ6MokAdgv7FJYrxtrUbMHJC578ldZc3SEg
-Y8XQfMf1bCRn0NyHpbMxYwLP/OpZATtAADG6GaGH0BBT9v9Ha7I61ytq/k4dD9R6
-mhAVoTXFJI2Zhe4WXXsVVDdjr/o0zC9pnXRJHdETQFmmbNKDXD0HwyVvWr7AWUM=
-=CEGe
+iQIcBAEBCgAGBQJPis+NAAoJENXLsxwXqFxypeIQAKu0efPm/OgKJxEpo8zjwqKH
+JYKGgGwOMJnlCpUNCJVVHVi7CKNmQH+sQkneATgSM6yq1u54a9Tzy9yp1pi+0wha
+mDyGIqOxtvQd9q0HGqDnnbaemfp40Gr5//nl9geBE/U123TvFxI6HjBqvH4CANEp
+Pbifpw0bZ+LWydgBbKooF0qtzYEIlgT4oRQwGsifRY64VohSneSx2zq4uxmyD2uc
+SRx7842TQaclwDc6700EqAg3C20Eq3NY3Ma14HlNflP+Cvbrc9qO7eyIJmL7h4kO
+lA8sgB1CU7IuY5XBJC8jj00Z6/hoVF8KAQPL9dzcmXrB/dKWoHBrGt/5Ug427Pqh
+YhfpaY8EyYhN+anm3ifvQGzR2qWSu0H1oR/uiCbzYsaTeDCEY/cKXtOQhp5ECqWo
+DY/nE5Xd18aGgn5EtB+OdlKal112HyzjfsK+lvpnu7rPBj3ip4+KnP2PO5pBTUtB
+QAuJCepE1MOcjb1lQArpl5yiDm4t1omHQera202TcKserwqe4Gcvt+KLyFnfppST
+5pJarKlbhsaIl5TFyuIve+Blf2tU7PsWCDDfuK/iC9wq23o/TZRwtfnj7kldA+wQ
+ZKceaDzKF5Qs1qCFH7gyawjCMSc0Nn4nd+LcbeoA4aiqwLYE/Ui2pQNxC0PL3Jds
+V24LlwrJlwyz7TEvT41Z
+=awoo
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-script/files/qt-script-4.8.1+gcc-4.7.patch b/x11-libs/qt-script/files/qt-script-4.8.1+gcc-4.7.patch
new file mode 100644
index 000000000000..e729f962265c
--- /dev/null
+++ b/x11-libs/qt-script/files/qt-script-4.8.1+gcc-4.7.patch
@@ -0,0 +1,44 @@
+From 7ac8d8597db1f58b11338f91fb27f6ad8696b34b Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Fri, 23 Mar 2012 16:29:57 +0100
+Subject: [PATCH] gcc 4.7.0 compatibility fix for javascript
+
+taken from http://qt-project.org/forums/viewthread/15071
+
+Change-Id: I701fb5a8d754afe9fcd6b327d779365673e07b5d
+Reviewed-by: Alexis Menard <alexis.menard@openbossa.org>
+Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
+---
+ .../JavaScriptCore/runtime/JSGlobalObject.h        |    2 +-
+ .../JavaScriptCore/runtime/JSStaticScopeObject.h   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+index 7c20272..9eb86e7 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
+@@ -59,7 +59,7 @@ namespace JSC {
+     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 --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+index 2542878..3cb66a0 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
+@@ -33,7 +33,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)
+             {
+-- 
+1.7.6
+
diff --git a/x11-libs/qt-script/qt-script-4.8.1.ebuild b/x11-libs/qt-script/qt-script-4.8.1.ebuild
index 95cada909b17..8001433d7b52 100644
--- a/x11-libs/qt-script/qt-script-4.8.1.ebuild
+++ b/x11-libs/qt-script/qt-script-4.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.8.1.ebuild,v 1.1 2012/03/29 22:15:28 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.8.1.ebuild,v 1.2 2012/04/15 13:39:19 pesa Exp $
 
 EAPI=4
 
@@ -16,6 +16,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}+gcc-4.7.patch"
+)
+
 pkg_setup() {
 	QT4_TARGET_DIRECTORIES="
 		src/script"