Version bump and fix bug #323669.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 132 insertions, 5 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index fdb840fe99a5..8c6b1293b1c5 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.74 2010/07/09 08:07:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.75 2010/07/18 17:36:05 pacho Exp $
+
+*webkit-gtk-1.2.3 (18 Jul 2010)
+
+  18 Jul 2010; Pacho Ramos <pacho@gentoo.org> +webkit-gtk-1.2.3.ebuild:
+  Version bump: some crashes fixed, new function has been added to clear the
+  back/forward, 'cursor hangs when dragging' and 'scrollbars no longer
+  working after going back' bugs have been solved, fix to build against ICU
+  4.4.1, a lot of security fixes from Debian. Also web-sockets is disabled
+  per bug #326547 (by Priit Laes).
 
   09 Jul 2010; Pacho Ramos <pacho@gentoo.org> webkit-gtk-1.2.1.ebuild:
   Set XDG_DATA_HOME to prevent test failures like bug #323669.
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 82a38f798d06..84e419a6fe05 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -7,14 +7,16 @@ AUX webkit-gtk-1.1.15.4-icu44.patch 4907 RMD160 aec153a9a9cbeb435a0e28ba567daf21
 AUX webkit-gtk-1.2.1-icu-4.4.patch 4343 RMD160 d1dbf729f96afd672e4d1eb0d7d24c8cc29833c0 SHA1 f5c87bf9436172fcc8263e739e8989ef5d480222 SHA256 8bbaf65397e1bc207b24af13bc3b70e04b099233e9f84a85891f1b9018b26491
 DIST webkit-1.1.15.4.tar.gz 6093252 RMD160 dcfae86f7a2fc63b478741b370ac620d1659513e SHA1 0778b130720756d880c2bbe9eeef79f35bcf861a SHA256 ec2511fc1d4a1e64534574cd5f9b2bc552de9bb22d7b3837dd17146fb5f1c90f
 DIST webkit-1.2.1.tar.gz 7577236 RMD160 f8c158b67fbcdfd9977edd530d5f8c15e402da6d SHA1 ced564514f0be0a88c696e7afd6902d967d532a2 SHA256 c9ee551eab4e98730fa06aaa493ce95828e6c6661ec14361e6254bc23795a2dd
+DIST webkit-1.2.3.tar.gz 6740030 RMD160 41fa194de2865867dbf7d1156d0962a7580f2275 SHA1 88c38ebeba187a062272b2aa8ca2bbd0bbb86306 SHA256 ff70b25ea8dedc0031f29f2ea8d9aa226bfa65ebd2f12772390f4e2845306fe1
 EBUILD webkit-gtk-1.1.15.4.ebuild 2550 RMD160 64a87a310fe47ccb336c66f39b3b86a1fa869d14 SHA1 193e316fe1ba246e32c550992782f0afa360bf46 SHA256 bd88cecc6710e5d52954f5c990ee322b1e18b5b47d04164789b346d2f00ff5c3
 EBUILD webkit-gtk-1.2.1.ebuild 3303 RMD160 fb214b06c1bc98e3fd89643e08adb20bdf42ed1a SHA1 9a2a203b72cd8e0ee35216a808f6b50654438c38 SHA256 5b1743f1f426c061b392c5ac3c05233a89e23cd3452fc5e297aec84a62d2b36b
-MISC ChangeLog 15144 RMD160 ebf7f27594313a1b0a4dbc4891aeb3b898a63120 SHA1 60be59b317c153e7e421ca6517ad4abdf1538828 SHA256 a2e54d5fb485c41af259f55ae0183c15ecd1603cb4d8dbd6d77772b462bf4300
+EBUILD webkit-gtk-1.2.3.ebuild 3225 RMD160 2d318befa88d835f3b7dd2acf6aeb76824fe76de SHA1 660128fad8f66708599ee65755340ad179cb0b9e SHA256 328d3638bee74e6dc02a1f9a4d9791beb24c8634d7b4ba3efc531c4d2ffd7f5e
+MISC ChangeLog 15584 RMD160 02b70e786850c313ec5c84c87b4f52cc02013c05 SHA1 cf0ffe9afdad916d8048ab2d61aa580826db9391 SHA256 68a3a0f3677b260c0b142880521c5237ff45db0fc3026cb68c00d3ff2da3359f
 MISC metadata.xml 318 RMD160 8779b2915c61a3efda9fdd42f64caa899e3bd2e0 SHA1 6ea9740e1524cbe0bb50316af693bb558fb41ecf SHA256 46a3afd2db9273d4fc19d548ac9935d2bd6ce9e6cf868d8c94331d950898b375
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkw22NcACgkQCaWpQKGI+9RQSQCdFmOl6pr49bfqcC5t24qIVIUu
-crcAn18v2nI4Vgg/EAWSysJJGJ7D7mpL
-=b3mo
+iEYEARECAAYFAkxDO44ACgkQCaWpQKGI+9QvRgCeK2UN9Og9S5a9JhXu1hwoHzgl
+FRwAni1muaQ6dyJPwVfS5n8lDHeiQlwv
+=UM1K
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild
new file mode 100644
index 000000000000..f30e2c21d944
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2010 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.2.3.ebuild,v 1.1 2010/07/18 17:36:05 pacho Exp $
+
+EAPI="2"
+
+inherit autotools flag-o-matic eutils virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2.1 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+# FIXME: we are still not ready for introspection
+IUSE="coverage debug doc +gstreamer" # aqua
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13 for gail
+# XXX: Quartz patch does not apply
+# >=x11-libs/gtk+-2.13[aqua=]
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/jpeg:0
+	media-libs/libpng
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.13
+	>=dev-libs/glib-2.21.3
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.29.90
+	>=dev-db/sqlite-3
+	>=app-text/enchant-0.22
+	>=x11-libs/pango-1.12
+
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		>=media-libs/gst-plugins-base-0.10.25:0.10 )"
+#	introspection? (
+#		>=dev-libs/gobject-introspection-0.6.2
+#		!!dev-libs/gir-repository[webkit]
+#		dev-libs/gir-repository[libsoup] )
+
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.10 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
+	# https://bugs.webkit.org/show_bug.cgi?id=19775
+	use sparc && epatch "${FILESDIR}"/${PN}-1.1.15.2-unaligned.patch
+
+	# Darwin/Aqua build is broken, needs autoreconf
+	# XXX: BROKEN. Patch does not apply anymore.
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	#epatch "${FILESDIR}"/${PN}-1.1.15.4-darwin-quartz.patch
+
+	# Make it libtool-1 compatible
+	rm -v autotools/lt* autotools/libtool.m4 \
+		|| die "removing libtool macros failed"
+	# Don't force -O2
+	sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=autotools eautoreconf
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu
+	use sparc && filter-flags "-mcpu=*" "-mtune=*"
+
+	local myconf
+
+	myconf="
+		--disable-introspection
+		--disable-web_sockets
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable gstreamer video)"
+		# Disable web-sockets per bug #326547
+		# quartz patch above does not apply anymore
+		#$(use aqua && echo "--with-target=quartz")"
+
+	econf ${myconf}
+}
+
+src_test() {
+	unset DISPLAY
+	# Tests can fail without it, bug 323669
+	export XDG_DATA_HOME="${T}"
+	# Tests will fail without it, bug 294691, bug 310695
+	Xemake check || die "Test phase failed"
+}
+
+#src_compile() {
+	# Fix sandbox error with USE="introspection"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
+#	addpredict "$(unset HOME; echo ~)/.local"
+#	emake || die "Compile failed"
+#}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
+}