summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2009-12-25 15:47:33 +0000
committerJonathan Callen <jcallen@gentoo.org>2009-12-25 15:47:33 +0000
commit8f02994d72dede100a307cbdc1ba3a3c4bb2df23 (patch)
treedc22ba5531e86f30ace82c4c073006d0c920ef9f /x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch
parentjson works fine with Ruby 1.9 as well. (diff)
downloadhistorical-8f02994d72dede100a307cbdc1ba3a3c4bb2df23.tar.gz
historical-8f02994d72dede100a307cbdc1ba3a3c4bb2df23.tar.bz2
historical-8f02994d72dede100a307cbdc1ba3a3c4bb2df23.zip
Add prefix support, revbump due to otherwise unresolvable USE deps
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch')
-rw-r--r--x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch b/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch
new file mode 100644
index 000000000000..1244d48ea251
--- /dev/null
+++ b/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch
@@ -0,0 +1,21 @@
+../JavaScriptCore/runtime/JSValue.h:479: error: cast from ‘JSC::JSCell*’
+to ‘int32_t’ loses precision
+
+Fix inspired by:
+http://bugreports.qt.nokia.com/browse/QTBUG-6948
+
+Seems already to have been fixed upstream webkit in a different way
+(PLATFORM(UNIX) iso DARWIN/LINUX/SOLARIS)
+
+
+--- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
++++ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
+@@ -709,7 +709,7 @@
+ #endif
+
+ #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
+-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS))
++#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS) || PLATFORM(SOLARIS))
+ #define WTF_USE_JSVALUE64 1
+ #elif PLATFORM(ARM) || PLATFORM(PPC64)
+ #define WTF_USE_JSVALUE32 1