| 1 |
commit: 25263d282661ea70d5140a7724a8d39cb11c1f6d |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 4 05:47:02 2012 +0000 |
| 4 |
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 4 05:47:02 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=25263d28 |
| 7 |
|
| 8 |
net-libs/webkit-gtk: add uclibc patch (#441674), update license |
| 9 |
|
| 10 |
--- |
| 11 |
...ebkit-gtk-1.10.1-disable-backtrace-uclibc.patch | 29 ++++++++++++++++++++ |
| 12 |
net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild | 5 +++- |
| 13 |
net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild | 5 +++- |
| 14 |
3 files changed, 37 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..510fe4f |
| 19 |
--- /dev/null |
| 20 |
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch |
| 21 |
@@ -0,0 +1,29 @@ |
| 22 |
+From: Anthony Basile <blueness@g.o> |
| 23 |
+Date: Sun, 04 Nov 2012 01:51:27 +0000 |
| 24 |
+ |
| 25 |
+webkit-gtk fails to build on a uclibc system because |
| 26 |
+Source/JavaScriptCore/wtf/Assertions.cpp assumes that all linux systems have |
| 27 |
+/usr/include/execinfo.h and provide backtrace(). But uclibc does not. Its |
| 28 |
+straightforward to extend the test to see if its also a uclibc system and not |
| 29 |
+include execinfo.h or call backtrace() |
| 30 |
+ |
| 31 |
+--- a/Source/WTF/wtf/Assertions.cpp |
| 32 |
++++ b/Source/WTF/wtf/Assertions.cpp |
| 33 |
+@@ -58,7 +58,7 @@ |
| 34 |
+ #include <windows.h> |
| 35 |
+ #endif |
| 36 |
+ |
| 37 |
+-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) |
| 38 |
++#if (OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)) && !OS(ANDROID) |
| 39 |
+ #include <cxxabi.h> |
| 40 |
+ #include <dlfcn.h> |
| 41 |
+ #include <execinfo.h> |
| 42 |
+@@ -268,7 +268,7 @@ |
| 43 |
+ |
| 44 |
+ void WTFGetBacktrace(void** stack, int* size) |
| 45 |
+ { |
| 46 |
+-#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) |
| 47 |
++#if (OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)) && !OS(ANDROID) |
| 48 |
+ *size = backtrace(stack, *size); |
| 49 |
+ #elif OS(WINDOWS) && !OS(WINCE) |
| 50 |
+ // The CaptureStackBackTrace function is available in XP, but it is not defined |
| 51 |
|
| 52 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild |
| 53 |
index bb432bc..8ab781d 100644 |
| 54 |
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild |
| 55 |
+++ b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild |
| 56 |
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.webkitgtk.org/" |
| 57 |
SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
| 58 |
#SRC_URI="mirror://gentoo/${P}.tar.xz" |
| 59 |
|
| 60 |
-LICENSE="LGPL-2 LGPL-2.1 BSD" |
| 61 |
+LICENSE="LGPL-2+ BSD" |
| 62 |
SLOT="3" |
| 63 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" |
| 64 |
# geoclue |
| 65 |
@@ -149,6 +149,9 @@ src_prepare() { |
| 66 |
# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602 |
| 67 |
epatch "${FILESDIR}/${PN}-1.9.91-libdl.patch" |
| 68 |
|
| 69 |
+ # uclibc fix, bug #441674 |
| 70 |
+ epatch "${FILESDIR}/${PN}-1.10.1-disable-backtrace-uclibc.patch" |
| 71 |
+ |
| 72 |
# Respect CC, otherwise fails on prefix #395875 |
| 73 |
tc-export CC |
| 74 |
|
| 75 |
|
| 76 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild |
| 77 |
index 06e82f6..c92517f 100644 |
| 78 |
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild |
| 79 |
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild |
| 80 |
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.webkitgtk.org/" |
| 81 |
SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz" |
| 82 |
#SRC_URI="mirror://gentoo/${P}.tar.xz" |
| 83 |
|
| 84 |
-LICENSE="LGPL-2 LGPL-2.1 BSD" |
| 85 |
+LICENSE="LGPL-2+ BSD" |
| 86 |
SLOT="3" |
| 87 |
#KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" |
| 88 |
KEYWORDS="" |
| 89 |
@@ -152,6 +152,9 @@ src_prepare() { |
| 90 |
# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602 |
| 91 |
epatch "${FILESDIR}/${P}-libdl.patch" |
| 92 |
|
| 93 |
+ # uclibc fix, bug #441674 |
| 94 |
+ epatch "${FILESDIR}/${PN}-1.10.1-disable-backtrace-uclibc.patch" |
| 95 |
+ |
| 96 |
# Respect CC, otherwise fails on prefix #395875 |
| 97 |
tc-export CC |
Archives