[gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/

["Priit Laes" <plaes@plaes.org>]

commit:     1cb62bc73b6dafc9b5c34c78da97f7d02c4fbea9
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jan 15 09:37:02 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jan 15 09:37:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1cb62bc7

net-libs/webkit-gtk: 1.11.2 → 1.11.4

---
 ...ebkit-gtk-1.10.1-disable-backtrace-uclibc.patch |   29 --------------------
 ...2-r300.ebuild => webkit-gtk-1.11.4-r300.ebuild} |   10 +++----
 2 files changed, 4 insertions(+), 35 deletions(-)

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
deleted file mode 100644
index 510fe4f..0000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Anthony Basile <blueness@gentoo.org>
-Date: Sun, 04 Nov 2012 01:51:27 +0000
-
-webkit-gtk fails to build on a uclibc system because
-Source/JavaScriptCore/wtf/Assertions.cpp assumes that all linux systems have
-/usr/include/execinfo.h and provide backtrace().  But uclibc does not.  Its
-straightforward to extend the test to see if its also a uclibc system and not
-include execinfo.h or call backtrace()
-
---- a/Source/WTF/wtf/Assertions.cpp
-+++ b/Source/WTF/wtf/Assertions.cpp
-@@ -58,7 +58,7 @@
- #include <windows.h>
- #endif
- 
--#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
-+#if (OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -268,7 +268,7 @@
- 
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID)
-+#if (OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)) && !OS(ANDROID)
-     *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
-     // The CaptureStackBackTrace function is available in XP, but it is not defined

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild
similarity index 96%
rename from net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
rename to net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild
index 65ec3a7..126b24a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild
@@ -14,8 +14,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="3"
-#KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 IUSE="aqua coverage debug +geoloc +gstreamer +introspection +jit spell +webgl"
 # bugs 372493, 416331
 REQUIRED_USE="introspection? ( geoloc gstreamer )"
@@ -28,13 +27,15 @@ RDEPEND="
 	app-crypt/libsecret
 	dev-libs/libxml2:2
 	dev-libs/libxslt
+	media-libs/harfbuzz
+	media-libs/libwebp
 	virtual/jpeg:=
 	>=media-libs/libpng-1.4:0=
 	>=x11-libs/cairo-1.10:=
 	>=dev-libs/glib-2.32:2
 	>=x11-libs/gtk+-3.4:3[aqua=,introspection?]
 	>=dev-libs/icu-3.8.1-r1:=
-	>=net-libs/libsoup-2.39.2:2.4[introspection?]
+	>=net-libs/libsoup-2.40.0:2.4[introspection?]
 	dev-db/sqlite:3=
 	>=x11-libs/pango-1.21
 	x11-libs/libXrender
@@ -155,9 +156,6 @@ src_prepare() {
 	# bug #417523, https://bugs.webkit.org/show_bug.cgi?id=96602
 	epatch "${FILESDIR}/${PN}-1.11.1-libdl.patch"
 
-	# uclibc fix, bug #441674
-	epatch "${FILESDIR}/${PN}-1.10.1-disable-backtrace-uclibc.patch"
-
 	# Respect CC, otherwise fails on prefix #395875
 	tc-export CC