diff options
Diffstat (limited to 'dev-qt/qtwebkit/files')
| -rw-r--r-- | dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch | 11 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch | 17 |
2 files changed, 28 insertions, 0 deletions
diff --git a/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch b/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch new file mode 100644 index 000000000000..16f52d9cb07e --- /dev/null +++ b/dev-qt/qtwebkit/files/4.8.2-javascriptcore-x32.patch @@ -0,0 +1,11 @@ +--- src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h.orig 2012-07-17 15:06:26.692276108 +0000 ++++ src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h 2012-07-17 15:06:54.480928701 +0000 +@@ -993,7 +993,7 @@ + #endif + + #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) +-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ ++#if (CPU(X86_64) && defined(__LP64__) && (OS(UNIX) || OS(WINDOWS))) \ + || (CPU(IA64) && !CPU(IA64_32)) \ + || CPU(ALPHA) \ + || CPU(SPARC64) \ diff --git a/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch b/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch new file mode 100644 index 000000000000..d29d5da7f04c --- /dev/null +++ b/dev-qt/qtwebkit/files/qtwebkit-4.8.1-no-use-ld-gold.patch @@ -0,0 +1,17 @@ +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 +--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:39:16.884473572 +0200 ++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/common.pri 2012-04-28 12:41:14.245006363 +0200 +@@ -3,13 +3,6 @@ + contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 + contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 + +-linux-g++ { +-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { +- message(Using gold linker) +- QMAKE_LFLAGS+=-fuse-ld=gold +-} +-} +- + # We use this flag on production branches + # See https://bugs.webkit.org/show_bug.cgi?id=60824 + CONFIG += production |