Archives
Archives
| From: | "Ben de Groot (yngwin)" <yngwin@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in dev-qt/qtwebkit/files: 4.8.2-javascriptcore-x32.patch qtwebkit-4.8.1-no-use-ld-gold.patch |
| Date: | Sat, 02 Mar 2013 15:35:48 |
| Message-Id: | 20130302153544.279532171E@flycatcher.gentoo.org |
| 1 | yngwin 13/03/02 15:35:44 |
| 2 | |
| 3 | Added: 4.8.2-javascriptcore-x32.patch |
| 4 | qtwebkit-4.8.1-no-use-ld-gold.patch |
| 5 | Log: |
| 6 | Move to new dev-qt category |
| 7 | |
| 8 | (Portage version: 2.2.0_alpha164/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x2B2474AD43CE296E!) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.1 dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch?rev=1.1&view=markup |
| 14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch?rev=1.1&content-type=text/plain |
| 15 | |
| 16 | Index: 4.8.2-javascriptcore-x32.patch |
| 17 | =================================================================== |
| 18 | --- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2012-07-17 15:06:26.692276108 +0000 |
| 19 | +++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2012-07-17 15:06:54.480928701 +0000 |
| 20 | @@ -993,7 +993,7 @@ |
| 21 | #endif |
| 22 | |
| 23 | #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) |
| 24 | -#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ |
| 25 | +#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS))) \ |
| 26 | || (CPU(IA64) && !CPU(IA64_32)) \ |
| 27 | || CPU(ALPHA) \ |
| 28 | || CPU(SPARC64) \ |
| 29 | |
| 30 | |
| 31 | |
| 32 | 1.1 dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch |
| 33 | |
| 34 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch?rev=1.1&view=markup |
| 35 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch?rev=1.1&content-type=text/plain |
| 36 | |
| 37 | Index: qtwebkit-4.8.1-no-use-ld-gold.patch |
| 38 | =================================================================== |
| 39 | diff -urN qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri |
| 40 | --- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:39:16.884473572 +0200 |
| 41 | +++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:41:14.245006363 +0200 |
| 42 | @@ -3,13 +3,6 @@ |
| 43 | contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 |
| 44 | contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 |
| 45 | |
| 46 | -linux-g++ { |
| 47 | -isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { |
| 48 | - message(Using gold linker) |
| 49 | - QMAKE_LFLAGS+=-fuse-ld=gold |
| 50 | -} |
| 51 | -} |
| 52 | - |
| 53 | # We use this flag on production branches |
| 54 | # See https://bugs.webkit.org/show_bug.cgi?id=60824 |
| 55 | CONFIG += production |