1 |
abcd 09/12/25 15:47:00 |
2 |
|
3 |
Added: qt-webkit-4.6.0-solaris-strnstr.patch |
4 |
qt-webkit-4.6.0-solaris-jsvalue.patch |
5 |
Log: |
6 |
Add prefix support, revbump due to otherwise unresolvable USE deps |
7 |
(Portage version: -svn/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-strnstr.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-strnstr.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-strnstr.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: qt-webkit-4.6.0-solaris-strnstr.patch |
16 |
=================================================================== |
17 |
(Open)Solaris doesn't have strnstr either: |
18 |
https://bugs.webkit.org/show_bug.cgi?id=30647 |
19 |
http://trac.webkit.org/changeset/50533 |
20 |
|
21 |
|
22 |
--- src/3rdparty/webkit/JavaScriptCore/wtf/StringExtras.h |
23 |
+++ src/3rdparty/webkit/JavaScriptCore/wtf/StringExtras.h |
24 |
@@ -85,7 +85,7 @@ |
25 |
|
26 |
#endif |
27 |
|
28 |
-#if PLATFORM(WIN_OS) || PLATFORM(LINUX) |
29 |
+#if PLATFORM(WIN_OS) || PLATFORM(LINUX) || PLATFORM(SOLARIS) |
30 |
|
31 |
inline char* strnstr(const char* buffer, const char* target, size_t bufferLength) |
32 |
{ |
33 |
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h |
34 |
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h |
35 |
@@ -85,7 +85,7 @@ |
36 |
|
37 |
#endif |
38 |
|
39 |
-#if PLATFORM(WIN_OS) || PLATFORM(LINUX) |
40 |
+#if PLATFORM(WIN_OS) || PLATFORM(LINUX) || PLATFORM(SOLARIS) |
41 |
|
42 |
inline char* strnstr(const char* buffer, const char* target, size_t bufferLength) |
43 |
{ |
44 |
|
45 |
|
46 |
|
47 |
1.1 x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch |
48 |
|
49 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch?rev=1.1&view=markup |
50 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/files/qt-webkit-4.6.0-solaris-jsvalue.patch?rev=1.1&content-type=text/plain |
51 |
|
52 |
Index: qt-webkit-4.6.0-solaris-jsvalue.patch |
53 |
=================================================================== |
54 |
../JavaScriptCore/runtime/JSValue.h:479: error: cast from ‘JSC::JSCell*’ |
55 |
to ‘int32_t’ loses precision |
56 |
|
57 |
Fix inspired by: |
58 |
http://bugreports.qt.nokia.com/browse/QTBUG-6948 |
59 |
|
60 |
Seems already to have been fixed upstream webkit in a different way |
61 |
(PLATFORM(UNIX) iso DARWIN/LINUX/SOLARIS) |
62 |
|
63 |
|
64 |
--- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h |
65 |
+++ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h |
66 |
@@ -709,7 +709,7 @@ |
67 |
#endif |
68 |
|
69 |
#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) |
70 |
-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS)) |
71 |
+#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(WIN_OS) || PLATFORM(SOLARIS)) |
72 |
#define WTF_USE_JSVALUE64 1 |
73 |
#elif PLATFORM(ARM) || PLATFORM(PPC64) |
74 |
#define WTF_USE_JSVALUE32 1 |