| 1 |
leio 09/09/28 00:18:00 |
| 2 |
|
| 3 |
Modified: ChangeLog webkit-gtk-1.1.10.ebuild |
| 4 |
Log: |
| 5 |
Reduce the gnome-keyring requirement to be able to stabilize the security fixes in this version earlier. Tweak some other dependencies to be more correct, also fixing bug 277463 |
| 6 |
(Portage version: 2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.48 net-libs/webkit-gtk/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.48&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.48&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.47&r2=1.48 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v |
| 18 |
retrieving revision 1.47 |
| 19 |
retrieving revision 1.48 |
| 20 |
diff -u -r1.47 -r1.48 |
| 21 |
--- ChangeLog 27 Sep 2009 18:31:52 -0000 1.47 |
| 22 |
+++ ChangeLog 28 Sep 2009 00:17:59 -0000 1.48 |
| 23 |
@@ -1,6 +1,13 @@ |
| 24 |
# ChangeLog for net-libs/webkit-gtk |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.47 2009/09/27 18:31:52 leio Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.48 2009/09/28 00:17:59 leio Exp $ |
| 28 |
+ |
| 29 |
+ 28 Sep 2009; Mart Raudsepp <leio@g.o> |
| 30 |
+ +files/webkit-gtk-1.1.10-reduce-gnome-keyring-req.patch, |
| 31 |
+ webkit-gtk-1.1.10.ebuild: |
| 32 |
+ Reduce the gnome-keyring requirement to be able to stabilize the security |
| 33 |
+ fixes in this version earlier. Tweak some other dependencies to be more |
| 34 |
+ correct, also fixing bug 277463 |
| 35 |
|
| 36 |
27 Sep 2009; Mart Raudsepp <leio@g.o> |
| 37 |
-files/webkit-gtk-0_p46126-cxxmissing.patch, |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.4 net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild?rev=1.4&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild?rev=1.4&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild?r1=1.3&r2=1.4 |
| 46 |
|
| 47 |
Index: webkit-gtk-1.1.10.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild,v |
| 50 |
retrieving revision 1.3 |
| 51 |
retrieving revision 1.4 |
| 52 |
diff -u -r1.3 -r1.4 |
| 53 |
--- webkit-gtk-1.1.10.ebuild 12 Sep 2009 22:42:02 -0000 1.3 |
| 54 |
+++ webkit-gtk-1.1.10.ebuild 28 Sep 2009 00:17:59 -0000 1.4 |
| 55 |
@@ -1,10 +1,10 @@ |
| 56 |
# Copyright 1999-2009 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $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 $ |
| 59 |
+# $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 $ |
| 60 |
|
| 61 |
EAPI="2" |
| 62 |
|
| 63 |
-inherit autotools |
| 64 |
+inherit autotools eutils |
| 65 |
|
| 66 |
MY_P="webkit-${PV}" |
| 67 |
DESCRIPTION="Open source web browser engine" |
| 68 |
@@ -26,15 +26,16 @@ |
| 69 |
x11-libs/cairo |
| 70 |
|
| 71 |
>=x11-libs/gtk+-2.10 |
| 72 |
+ >=gnome-base/gail-1.8 |
| 73 |
>=dev-libs/icu-3.8.1-r1 |
| 74 |
>=net-libs/libsoup-2.25.90 |
| 75 |
>=dev-db/sqlite-3 |
| 76 |
>=app-text/enchant-0.22 |
| 77 |
|
| 78 |
- gnome-keyring? ( >=gnome-base/gnome-keyring-2.26.0 ) |
| 79 |
+ gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.3-r2 ) |
| 80 |
gstreamer? ( |
| 81 |
media-libs/gstreamer:0.10 |
| 82 |
- media-libs/gst-plugins-base:0.10 ) |
| 83 |
+ >=media-libs/gst-plugins-base-0.10.11:0.10 ) |
| 84 |
pango? ( x11-libs/pango ) |
| 85 |
!pango? ( |
| 86 |
media-libs/freetype:2 |
| 87 |
@@ -55,6 +56,13 @@ |
| 88 |
rm -v autotools/lt* autotools/libtool.m4 || die "removing libtool macros failed" |
| 89 |
# Don't force -O2 |
| 90 |
sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed" |
| 91 |
+ |
| 92 |
+ # Reduce the gnome-keyring requirement from 2.26 to 2.22.3: |
| 93 |
+ # Upstream requires so new version only because earlier versions didn't install headers |
| 94 |
+ # that can be included from C++ code. We now have fixes to the headers in our |
| 95 |
+ # gnome-keyring-2.22.3-r2, so we can work with just that if we reduce req in configure. |
| 96 |
+ epatch "${FILESDIR}/${P}-reduce-gnome-keyring-req.patch" |
| 97 |
+ |
| 98 |
# Prevent maintainer mode from being triggered during make |
| 99 |
AT_M4DIR=autotools eautoreconf |
| 100 |
} |
Archives