diff options
Diffstat (limited to 'net-libs/webkit-gtk/files')
| -rw-r--r-- | net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch | 36 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch | 29 |
2 files changed, 65 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch new file mode 100644 index 000000000000..415fdfc3b2a5 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-double-conversion.patch @@ -0,0 +1,36 @@ +From adad38e6096468a22f62a913cd4cc8fb95e698ec Mon Sep 17 00:00:00 2001 +From: "commit-queue@webkit.org" + <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> +Date: Sun, 16 Oct 2011 00:54:05 +0000 +Subject: [PATCH] The s390 and s390x architectures both use 64-bit double type + that conforms to the IEEE-754 standard. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://bugs.webkit.org/show_bug.cgi?id=69940 + +Patch by Dan Horák <dan@danny.cz> on 2011-10-15 +Reviewed by Gavin Barraclough. + +* wtf/dtoa/utils.h: + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97568 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/JavaScriptCore/ChangeLog | 11 +++++++++++ + Source/JavaScriptCore/wtf/dtoa/utils.h | 2 +- + 2 files changed, 12 insertions(+), 1 deletions(-) + +Index: webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h +=================================================================== +--- webkit-1.6.1.orig/Source/JavaScriptCore/wtf/dtoa/utils.h 2011-10-21 11:44:37.000000000 -0200 ++++ webkit-1.6.1/Source/JavaScriptCore/wtf/dtoa/utils.h 2011-10-21 11:46:41.928885576 -0200 +@@ -49,7 +49,7 @@ + defined(__ARMEL__) || \ + defined(_MIPS_ARCH_MIPS32R2) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 +-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) ++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) + #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 + #elif defined(_M_IX86) || defined(__i386__) + #if defined(_WIN32) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch new file mode 100644 index 000000000000..765dbe0f36ff --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-pkgconfig-fix.patch @@ -0,0 +1,29 @@ +From 9adb931bd0899eaa53aa77a57a296b75ece8f0dc Mon Sep 17 00:00:00 2001 +From: "kov@webkit.org" <kov@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> +Date: Thu, 20 Oct 2011 15:00:16 +0000 +Subject: [PATCH] [GTK] webkitgtk's pkgconfig file needs to require + javascriptcoregtk + https://bugs.webkit.org/show_bug.cgi?id=70500 + +Reviewed by Philippe Normand. + +* webkit.pc.in: add javascriptcoregtk to Requires + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97979 268f45cc-cd09-0410-ab3c-d52691b4dbfc +--- + Source/WebKit/gtk/ChangeLog | 9 +++++++++ + Source/WebKit/gtk/webkit.pc.in | 2 +- + 2 files changed, 10 insertions(+), 1 deletions(-) + +Index: webkit-1.6.1/Source/WebKit/gtk/webkit.pc.in +=================================================================== +--- webkit-1.6.1.orig/Source/WebKit/gtk/webkit.pc.in 2011-10-23 20:36:14.000000000 -0200 ++++ webkit-1.6.1/Source/WebKit/gtk/webkit.pc.in 2011-10-23 20:38:06.180793290 -0200 +@@ -6,6 +6,6 @@ + Name: WebKit + Description: Web content engine for GTK+ + Version: @VERSION@ +-Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 ++Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libsoup-2.4 javascriptcoregtk-@WEBKITGTK_API_VERSION@ + Libs: -L${libdir} -lwebkitgtk-@WEBKITGTK_API_VERSION@ + Cflags: -I${includedir}/webkit-@WEBKITGTK_API_VERSION@ |