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 B9DBA198005 for ; Sun, 3 Mar 2013 00:57:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 566C0E068E; Sun, 3 Mar 2013 00:57:03 +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 C8453E068E for ; Sun, 3 Mar 2013 00:57:02 +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 AEE8733DC30 for ; Sun, 3 Mar 2013 00:57:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 28834E4073 for ; Sun, 3 Mar 2013 00:57:00 +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: <1362272172.38ad4bd8a384837e1239c4d7032095eb89d3c0de.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.11.90-gtk-docize-fix.patch net-libs/webkit-gtk/webkit-gtk-1.11.5-r300.ebuild net-libs/webkit-gtk/webkit-gtk-1.11.90-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: 38ad4bd8a384837e1239c4d7032095eb89d3c0de X-VCS-Branch: master Date: Sun, 3 Mar 2013 00:57:00 +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: 021ad10c-1631-4fc9-b4ce-def08d4dfe01 X-Archives-Hash: ac23b330c9cc2728ec5c5c0fcf07a253 commit: 38ad4bd8a384837e1239c4d7032095eb89d3c0de Author: Priit Laes plaes org> AuthorDate: Sun Mar 3 00:56:12 2013 +0000 Commit: Priit Laes plaes org> CommitDate: Sun Mar 3 00:56:12 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=38ad4bd8 net-libs/webkit-gtk: 1.11.5 → 1.11.90 --- .../files/webkit-gtk-1.11.90-gtk-docize-fix.patch | 10 ++++++++++ ...-r300.ebuild => webkit-gtk-1.11.90-r300.ebuild} | 14 +++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch new file mode 100644 index 0000000..8f56ab2 --- /dev/null +++ b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch @@ -0,0 +1,10 @@ +--- configure.ac.old 2013-03-02 09:22:53.791750644 +0200 ++++ configure.ac 2013-03-02 09:24:56.725213764 +0200 +@@ -24,6 +24,7 @@ + m4_include([Source/autotools/SetupLibtool.m4]) + m4_include([Source/autotools/ReadCommandLineArguments.m4]) + m4_include([Source/autotools/FindDependencies.m4]) ++GTK_DOC_CHECK([1.10]) + m4_include([Source/autotools/SetupCompilerFlags.m4]) + m4_include([Source/autotools/SetupAutoconfHeader.m4]) + diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.5-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.90-r300.ebuild similarity index 96% rename from net-libs/webkit-gtk/webkit-gtk-1.11.5-r300.ebuild rename to net-libs/webkit-gtk/webkit-gtk-1.11.90-r300.ebuild index 8e7f8a8..641baea 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.11.5-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.11.90-r300.ebuild @@ -27,7 +27,6 @@ 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= @@ -43,8 +42,8 @@ RDEPEND=" geoloc? ( app-misc/geoclue ) gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 ) + >=media-libs/gstreamer-1.0.3:1.0 + >=media-libs/gst-plugins-base-1.0.3:1.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22:= ) webgl? ( @@ -113,11 +112,8 @@ src_prepare() { # https://bugs.webkit.org/show_bug.cgi?id=28727 use aqua && epatch "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch - # Drop DEPRECATED flags - LC_ALL=C sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die - # Don't force -O2 - sed -i 's/-O2//g' "${S}"/configure.ac || die + sed -i 's/-O2//g' "${S}"/Source/autotools/SetupCompilerFlags.m4 || die # Build-time segfaults under PaX with USE="introspection jit", bug #404215 if use introspection && use jit; then @@ -156,6 +152,8 @@ src_prepare() { # Respect CC, otherwise fails on prefix #395875 tc-export CC + epatch "${FILESDIR}/${P}-gtk-docize-fix.patch" + # Prevent maintainer mode from being triggered during make AT_M4DIR=Source/autotools eautoreconf @@ -183,7 +181,6 @@ src_configure() { myconf=" $(use_enable coverage) $(use_enable debug) - $(use_enable debug debug-features) $(use_enable geoloc geolocation) $(use_enable spell spellcheck) $(use_enable introspection) @@ -193,7 +190,6 @@ src_configure() { --disable-egl --disable-gles2 --with-gtk=3.0 - --with-gstreamer=1.0 --enable-accelerated-compositing --enable-dependency-tracking --disable-gtk-doc