1 |
pacho 11/11/29 13:25:45 |
2 |
|
3 |
Added: webkit-gtk-1.6.1-pkgconfig-fix.patch |
4 |
webkit-gtk-1.6.1-double-conversion.patch |
5 |
Log: |
6 |
Apply upstream patches to fix pkgconfig file and arches that use 64-bit double type, use gnome2_environment_reset, drop DEPRECATED flags (they were passed with USE debug), skip flacky tests after reporting failures to upstream. |
7 |
|
8 |
(Portage version: 2.1.10.38/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: webkit-gtk-1.6.1-pkgconfig-fix.patch |
17 |
=================================================================== |
18 |
From 9adb931bd0899eaa53aa77a57a296b75ece8f0dc Mon Sep 17 00:00:00 2001 |
19 |
From: "kov@××××××.org" <kov@××××××.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> |
20 |
Date: Thu, 20 Oct 2011 15:00:16 +0000 |
21 |
Subject: [PATCH] [GTK] webkitgtk's pkgconfig file needs to require |
22 |
javascriptcoregtk |
23 |
https://bugs.webkit.org/show_bug.cgi?id=70500 |
24 |
|
25 |
Reviewed by Philippe Normand. |
26 |
|
27 |
* webkit.pc.in: add javascriptcoregtk to Requires |
28 |
|
29 |
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97979 268f45cc-cd09-0410-ab3c-d52691b4dbfc |
30 |
--- |
31 |
Source/WebKit/gtk/ChangeLog | 9 +++++++++ |
32 |
Source/WebKit/gtk/webkit.pc.in | 2 +- |
33 |
2 files changed, 10 insertions(+), 1 deletions(-) |
34 |
|
35 |
Index: webkit-1.6.1/Source/WebKit/gtk/webkit.pc.in |
36 |
=================================================================== |
37 |
--- webkit-1.6.1.orig/Source/WebKit/gtk/webkit.pc.in 2011-10-23 20:36:14.000000000 -0200 |
38 |
+++ webkit-1.6.1/Source/WebKit/gtk/webkit.pc.in 2011-10-23 20:38:06.180793290 -0200 |
39 |
@@ -6,6 +6,6 @@ |
40 |
Name: WebKit |
41 |
Description: Web content engine for GTK+ |
42 |
Version: @VERSION@ |
43 |
-Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 |
44 |
+Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@ |
45 |
Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@ |
46 |
Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@ |
47 |
|
48 |
|
49 |
|
50 |
1.1 net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch |
51 |
|
52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch?rev=1.1&view=markup |
53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch?rev=1.1&content-type=text/plain |
54 |
|
55 |
Index: webkit-gtk-1.6.1-double-conversion.patch |
56 |
=================================================================== |
57 |
From adad38e6096468a22f62a913cd4cc8fb95e698ec Mon Sep 17 00:00:00 2001 |
58 |
From: "commit-queue@××××××.org" |
59 |
<commit-queue@××××××.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> |
60 |
Date: Sun, 16 Oct 2011 00:54:05 +0000 |
61 |
Subject: [PATCH] The s390 and s390x architectures both use 64-bit double type |
62 |
that conforms to the IEEE-754 standard. |
63 |
MIME-Version: 1.0 |
64 |
Content-Type: text/plain; charset=UTF-8 |
65 |
Content-Transfer-Encoding: 8bit |
66 |
|
67 |
https://bugs.webkit.org/show_bug.cgi?id=69940 |
68 |
|
69 |
Patch by Dan Horák <dan@×××××.cz> on 2011-10-15 |
70 |
Reviewed by Gavin Barraclough. |
71 |
|
72 |
* wtf/dtoa/utils.h: |
73 |
|
74 |
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97568 268f45cc-cd09-0410-ab3c-d52691b4dbfc |
75 |
--- |
76 |
Source/JavaScriptCore/ChangeLog | 11 +++++++++++ |
77 |
Source/JavaScriptCore/wtf/dtoa/utils.h | 2 +- |
78 |
2 files changed, 12 insertions(+), 1 deletions(-) |
79 |
|
80 |
Index: webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h |
81 |
=================================================================== |
82 |
--- webkit-1.6.1.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2011-10-21 11:44:37.000000000 -0200 |
83 |
+++ webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h 2011-10-21 11:46:41.928885576 -0200 |
84 |
@@ -49,7 +49,7 @@ |
85 |
defined(__ARMEL__) || \ |
86 |
defined(_MIPS_ARCH_MIPS32R2) |
87 |
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 |
88 |
-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) |
89 |
+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) |
90 |
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 |
91 |
#elif defined(_M_IX86) || defined(__i386__) |
92 |
#if defined(_WIN32) |