From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 01D161384AA for ; Tue, 15 Jan 2013 09:39:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A883E0534; Tue, 15 Jan 2013 09:39:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E3E1CE0534 for ; Tue, 15 Jan 2013 09:39:45 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C087833D3DC for ; Tue, 15 Jan 2013 09:39:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1A07CE4073 for ; Tue, 15 Jan 2013 09:39:43 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <1358242622.1cb62bc73b6dafc9b5c34c78da97f7d02c4fbea9.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/webkit-gtk/files/webkit-gtk-1.10.1-disable-backtrace-uclibc.patch net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild net-libs/webkit-gtk/webkit-gtk-1.11.4-r300.ebuild X-VCS-Directories: net-libs/webkit-gtk/files/ net-libs/webkit-gtk/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 1cb62bc73b6dafc9b5c34c78da97f7d02c4fbea9 X-VCS-Branch: master Date: Tue, 15 Jan 2013 09:39:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1c2aa0b3-082d-4de5-9795-cfc2ac83d8d0 X-Archives-Hash: daf89b61a7bb7ea60a95e15bad38d166 commit: 1cb62bc73b6dafc9b5c34c78da97f7d02c4fbea9 Author: Priit Laes plaes org> AuthorDate: Tue Jan 15 09:37:02 2013 +0000 Commit: Priit Laes plaes 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 -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 - #endif - --#if (OS(DARWIN) || OS(LINUX)) && !OS(ANDROID) -+#if (OS(DARWIN) || OS(LINUX) && !defined(__UCLIBC__)) && !OS(ANDROID) - #include - #include - #include -@@ -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