From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Ms3wH-0005J5-K0 for garchives@archives.gentoo.org; Mon, 28 Sep 2009 00:18:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2ED33E080A; Mon, 28 Sep 2009 00:18:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E235CE080A for ; Mon, 28 Sep 2009 00:18:00 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 7B23766C06 for ; Mon, 28 Sep 2009 00:18:00 +0000 (UTC) Received: from leio by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1Ms3wG-0003kZ-3d for gentoo-commits@lists.gentoo.org; Mon, 28 Sep 2009 00:18:00 +0000 From: "Mart Raudsepp (leio)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, leio@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk: ChangeLog webkit-gtk-1.1.10.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog webkit-gtk-1.1.10.ebuild X-VCS-Directories: net-libs/webkit-gtk X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp Content-Type: text/plain; charset=utf8 Message-Id: Sender: Mart Raudsepp Date: Mon, 28 Sep 2009 00:18:00 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6c742606-3caa-494d-914f-a66e1bc41ab1 X-Archives-Hash: 9e9f942460217a2b345d3f4e9d618e8a leio 09/09/28 00:18:00 Modified: ChangeLog webkit-gtk-1.1.10.ebuild Log: Reduce the gnome-keyring requirement to be able to stabilize the securi= ty fixes in this version earlier. Tweak some other dependencies to be mor= e correct, also fixing bug 277463 (Portage version: 2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64) Revision Changes Path 1.48 net-libs/webkit-gtk/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gt= k/ChangeLog?rev=3D1.48&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gt= k/ChangeLog?rev=3D1.48&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gt= k/ChangeLog?r1=3D1.47&r2=3D1.48 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- ChangeLog 27 Sep 2009 18:31:52 -0000 1.47 +++ ChangeLog 28 Sep 2009 00:17:59 -0000 1.48 @@ -1,6 +1,13 @@ # ChangeLog for net-libs/webkit-gtk # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.47 = 2009/09/27 18:31:52 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.48 = 2009/09/28 00:17:59 leio Exp $ + + 28 Sep 2009; Mart Raudsepp + +files/webkit-gtk-1.1.10-reduce-gnome-keyring-req.patch, + webkit-gtk-1.1.10.ebuild: + Reduce the gnome-keyring requirement to be able to stabilize the secur= ity + fixes in this version earlier. Tweak some other dependencies to be mor= e + correct, also fixing bug 277463 =20 27 Sep 2009; Mart Raudsepp -files/webkit-gtk-0_p46126-cxxmissing.patch, 1.4 net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gt= k/webkit-gtk-1.1.10.ebuild?rev=3D1.4&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gt= k/webkit-gtk-1.1.10.ebuild?rev=3D1.4&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gt= k/webkit-gtk-1.1.10.ebuild?r1=3D1.3&r2=3D1.4 Index: webkit-gtk-1.1.10.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.10.e= build,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- webkit-gtk-1.1.10.ebuild 12 Sep 2009 22:42:02 -0000 1.3 +++ webkit-gtk-1.1.10.ebuild 28 Sep 2009 00:17:59 -0000 1.4 @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.10= .ebuild,v 1.3 2009/09/12 22:42:02 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.10= .ebuild,v 1.4 2009/09/28 00:17:59 leio Exp $ =20 EAPI=3D"2" =20 -inherit autotools +inherit autotools eutils =20 MY_P=3D"webkit-${PV}" DESCRIPTION=3D"Open source web browser engine" @@ -26,15 +26,16 @@ x11-libs/cairo =20 >=3Dx11-libs/gtk+-2.10 + >=3Dgnome-base/gail-1.8 >=3Ddev-libs/icu-3.8.1-r1 >=3Dnet-libs/libsoup-2.25.90 >=3Ddev-db/sqlite-3 >=3Dapp-text/enchant-0.22 =20 - gnome-keyring? ( >=3Dgnome-base/gnome-keyring-2.26.0 ) + gnome-keyring? ( >=3Dgnome-base/gnome-keyring-2.22.3-r2 ) gstreamer? ( media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 ) + >=3Dmedia-libs/gst-plugins-base-0.10.11:0.10 ) pango? ( x11-libs/pango ) !pango? ( media-libs/freetype:2 @@ -55,6 +56,13 @@ rm -v autotools/lt* autotools/libtool.m4 || die "removing libtool macro= s failed" # Don't force -O2 sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed" + + # Reduce the gnome-keyring requirement from 2.26 to 2.22.3: + # Upstream requires so new version only because earlier versions didn't= install headers + # that can be included from C++ code. We now have fixes to the headers = in our + # gnome-keyring-2.22.3-r2, so we can work with just that if we reduce r= eq in configure. + epatch "${FILESDIR}/${P}-reduce-gnome-keyring-req.patch" + # Prevent maintainer mode from being triggered during make AT_M4DIR=3Dautotools eautoreconf }