diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2013-01-05 15:09:35 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-01-05 15:09:35 +0000 |
| commit | c2bbf3afd8380d795ffcd9205c7549764fbbfdca (patch) | |
| tree | 6bf13fad38f6ba4564440a8b954be58fac65b1f2 /x11-libs | |
| parent | added requ'd {] to setuptools, customised install of a keyfile into docdir, m... (diff) | |
| download | gentoo-2-c2bbf3afd8380d795ffcd9205c7549764fbbfdca.tar.gz gentoo-2-c2bbf3afd8380d795ffcd9205c7549764fbbfdca.tar.bz2 gentoo-2-c2bbf3afd8380d795ffcd9205c7549764fbbfdca.zip | |
Re-add forgotten patch for x32, thanks to josef64 for noticing.
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-script/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/qt-script/files/4.8.2-javascriptcore-x32.patch | 12 | ||||
| -rw-r--r-- | x11-libs/qt-script/qt-script-4.8.4.ebuild | 6 |
3 files changed, 22 insertions, 4 deletions
diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog index 5f651e629778..231806d77471 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.146 2012/12/31 06:01:11 pesa Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.147 2013/01/05 15:09:35 kensington Exp $ + + 05 Jan 2013; Michael Palimaka <kensington@gentoo.org> + +files/4.8.2-javascriptcore-x32.patch, qt-script-4.8.4.ebuild: + Re-add forgotten patch for x32, thanks to josef64 for noticing. 31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml: Cleanup metadata. diff --git a/x11-libs/qt-script/files/4.8.2-javascriptcore-x32.patch b/x11-libs/qt-script/files/4.8.2-javascriptcore-x32.patch new file mode 100644 index 000000000000..35a157337cf9 --- /dev/null +++ b/x11-libs/qt-script/files/4.8.2-javascriptcore-x32.patch @@ -0,0 +1,12 @@ +diff -urN qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +--- qt-everywhere-opensource-src-4.8.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2012-06-14 16:17:21.328043461 +0200 ++++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2012-06-14 16:42:13.699386250 +0200 +@@ -884,7 +884,7 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) +-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) ++#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) + #define WTF_USE_JSVALUE64 1 + #elif CPU(ARM) || CPU(PPC64) + #define WTF_USE_JSVALUE32 1 diff --git a/x11-libs/qt-script/qt-script-4.8.4.ebuild b/x11-libs/qt-script/qt-script-4.8.4.ebuild index 57164fb05192..5392a22142f5 100644 --- a/x11-libs/qt-script/qt-script-4.8.4.ebuild +++ b/x11-libs/qt-script/qt-script-4.8.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 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.4.ebuild,v 1.10 2012/12/29 08:47:53 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/qt-script-4.8.4.ebuild,v 1.11 2013/01/05 15:09:35 kensington Exp $ EAPI=4 @@ -20,6 +20,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/4.8.2-javascriptcore-x32.patch" ) + pkg_setup() { QT4_TARGET_DIRECTORIES=" src/script" |