| 1 |
grobian 10/11/25 07:25:39 |
| 2 |
|
| 3 |
Modified: ChangeLog webkit-gtk-1.2.5.ebuild |
| 4 |
Log: |
| 5 |
Re-introduce USE=aqua, add necessary patches |
| 6 |
|
| 7 |
(Portage version: 2.2.01.17168-prefix/cvs/Darwin powerpc) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.85 net-libs/webkit-gtk/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.85&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.85&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.84&r2=1.85 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v |
| 19 |
retrieving revision 1.84 |
| 20 |
retrieving revision 1.85 |
| 21 |
diff -u -r1.84 -r1.85 |
| 22 |
--- ChangeLog 24 Nov 2010 08:12:00 -0000 1.84 |
| 23 |
+++ ChangeLog 25 Nov 2010 07:25:39 -0000 1.85 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for net-libs/webkit-gtk |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.84 2010/11/24 08:12:00 grobian Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.85 2010/11/25 07:25:39 grobian Exp $ |
| 29 |
+ |
| 30 |
+ 25 Nov 2010; Fabian Groffen <grobian@g.o> webkit-gtk-1.2.5.ebuild, |
| 31 |
+ +files/webkit-gtk-1.2.5-darwin-quartz.patch, |
| 32 |
+ +files/webkit-gtk-1.2.5-darwin8.patch: |
| 33 |
+ Re-introduce USE=aqua, add necessary patches |
| 34 |
|
| 35 |
24 Nov 2010; Fabian Groffen <grobian@g.o> webkit-gtk-1.2.5.ebuild: |
| 36 |
Fix double-prefix issue, bug #346595 |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.4 net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild?rev=1.4&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild?rev=1.4&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild?r1=1.3&r2=1.4 |
| 45 |
|
| 46 |
Index: webkit-gtk-1.2.5.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v |
| 49 |
retrieving revision 1.3 |
| 50 |
retrieving revision 1.4 |
| 51 |
diff -u -r1.3 -r1.4 |
| 52 |
--- webkit-gtk-1.2.5.ebuild 24 Nov 2010 08:12:00 -0000 1.3 |
| 53 |
+++ webkit-gtk-1.2.5.ebuild 25 Nov 2010 07:25:39 -0000 1.4 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2010 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v 1.3 2010/11/24 08:12:00 grobian Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.5.ebuild,v 1.4 2010/11/25 07:25:39 grobian Exp $ |
| 59 |
|
| 60 |
EAPI="3" |
| 61 |
|
| 62 |
@@ -15,19 +15,18 @@ |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" |
| 65 |
# geoclue is missing |
| 66 |
-IUSE="coverage debug doc +gstreamer introspection" # aqua |
| 67 |
+IUSE="aqua coverage debug doc +gstreamer introspection" |
| 68 |
|
| 69 |
# use sqlite, svg by default |
| 70 |
# dependency on >=x11-libs/gtk+-2.13 for gail |
| 71 |
# XXX: Quartz patch does not apply |
| 72 |
-# >=x11-libs/gtk+-2.13[aqua=] |
| 73 |
RDEPEND=" |
| 74 |
dev-libs/libxml2 |
| 75 |
dev-libs/libxslt |
| 76 |
virtual/jpeg |
| 77 |
>=media-libs/libpng-1.4 |
| 78 |
x11-libs/cairo |
| 79 |
- >=x11-libs/gtk+-2.13 |
| 80 |
+ >=x11-libs/gtk+-2.13[aqua=] |
| 81 |
>=dev-libs/glib-2.21.3 |
| 82 |
>=dev-libs/icu-3.8.1-r1 |
| 83 |
>=net-libs/libsoup-2.29.90 |
| 84 |
@@ -55,10 +54,12 @@ |
| 85 |
# https://bugs.webkit.org/show_bug.cgi?id=19775 |
| 86 |
use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch |
| 87 |
|
| 88 |
- # Darwin/Aqua build is broken, needs autoreconf |
| 89 |
- # XXX: BROKEN. Patch does not apply anymore. |
| 90 |
+ # intermediate MacPorts hack while upstream bug is not fixed properly |
| 91 |
# https://bugs.webkit.org/show_bug.cgi?id=28727 |
| 92 |
- #epatch "${FILESDIR}"/${PN}-1.1.15.4-darwin-quartz.patch |
| 93 |
+ use aqua && epatch "${FILESDIR}"/${P}-darwin-quartz.patch |
| 94 |
+ |
| 95 |
+ # Fix build on Darwin8 (10.4 Tiger) |
| 96 |
+ epatch "${FILESDIR}"/${P}-darwin8.patch |
| 97 |
|
| 98 |
# Don't force -O2 |
| 99 |
sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed" |
| 100 |
@@ -82,10 +83,9 @@ |
| 101 |
$(use_enable coverage) |
| 102 |
$(use_enable debug) |
| 103 |
$(use_enable gstreamer video) |
| 104 |
- $(use_enable introspection)" |
| 105 |
+ $(use_enable introspection) |
| 106 |
+ $(use aqua && echo "--with-font-backend=pango --with-target=quartz")" |
| 107 |
# Disable web-sockets per bug #326547 |
| 108 |
- # quartz patch above does not apply anymore |
| 109 |
- #$(use aqua && echo "--with-target=quartz")" |
| 110 |
|
| 111 |
econf ${myconf} |
| 112 |
} |
Archives