# ChangeLog for net-libs/webkit-gtk
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.119 2011/08/31 13:11:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.120 2011/09/22 18:42:10 pacho Exp $
+
+*webkit-gtk-1.4.3-r300 (22 Sep 2011)
+*webkit-gtk-1.4.3-r200 (22 Sep 2011)
+
+ 22 Sep 2011; Pacho Ramos <pacho@gentoo.org> +webkit-gtk-1.4.3-r200.ebuild,
+ +webkit-gtk-1.4.3-r300.ebuild, +files/webkit-gtk-1.4.3-underlinking.patch:
+ Version bump and fix underlinking problems in gtk3 version (bug #371751).
31 Aug 2011; Pacho Ramos <pacho@gentoo.org> webkit-gtk-1.2.7.ebuild:
Parallel build fails for 1.2.x, seems fixed in 1.4.x (bug #343249).
AUX webkit-gtk-1.2.5-tests-build.patch 526 RMD160 c336c7309899169a2691bf3b984fa4df480b2ad4 SHA1 c25129b41dcca46424d58c3796f7207119e4a790 SHA256 aa2875954048318f2a9c5035b670774a1c5ce1b641b067f936fa076f38659383
AUX webkit-gtk-1.2.7-libpng15.patch 1657 RMD160 19cec5b29437313372b9b25d43029105197a4abf SHA1 2748a46b1a4c9d547094ae2795ad2c812fbf59aa SHA256 0aef21a127b9427cb98684102c91902f38585c7d7642525760c7a7d9f0d39dc7
AUX webkit-gtk-1.4.1-libpng15.patch 2571 RMD160 427d9746f365f27c66be0c73a41c7034754e2522 SHA1 0481a4039c79414449262392758a63e97157ff93 SHA256 c014d8380270a73d96069f5eac343fab40d1a1112b03c32e5e6365da89ab7705
+AUX webkit-gtk-1.4.3-underlinking.patch 3205 RMD160 2e7e7fea7c3e2817f8eda09982432b7f4006c89f SHA1 677e48ff18409fdaad6a03a34dac4cd45afc65a4 SHA256 dd67fa8d728fc4ba8377cb4107ac28a2daf36ab89c87ccd66f8f5e7093c50d49
DIST webkit-1.2.7.tar.gz 6615990 RMD160 f36b3ae05693e0eeb4d1936ceee52b6fe1517e57 SHA1 e9afc573d2459794c3749ba404f2187f9dcc9ed3 SHA256 228a80b3f0132db1342708e8ef7738996f05e30393e0187acf4cab987283718b
DIST webkit-1.4.2.tar.gz 8504310 RMD160 e1de3cd5576d7ccc771475cda8c0e3b59aba1af7 SHA1 675ae0bfef56b8519f3f00b04fc7baf72215bd3b SHA256 dee6336b5366e952f67a18a66dca2edce95a8e70f591dbc7fc30cf30b5fdb9ba
+DIST webkit-1.4.3.tar.gz 8512387 RMD160 43d1fd1cfd0cbf9fc83b107f05442e2d531c03aa SHA1 a24adee9583d66ebc93ac61ce9881947a54c569d SHA256 b808ace6b3edad76aba57cc746a430051abfedf301c969628b989a1128dd37e4
EBUILD webkit-gtk-1.2.7.ebuild 3407 RMD160 29ef994a54ba6e32f0530b45c3927eb2940a96a1 SHA1 739722c6edde3ba56719cceedf2d1b9b9e9ce477 SHA256 8971d4fe3c00c321cc6f82f18a7de84bfb81709da4d1913a6aa756e32089b9cf
EBUILD webkit-gtk-1.4.2-r200.ebuild 3672 RMD160 0be69c14bbd395a8e1940b2ca9469e27d4963c3b SHA1 ba9d7ff375539bccf9cc96970b8627ca8a4c623b SHA256 0e19f480dbdbde9bc93d4e43ac9a50984a1446a3fcd325642e0c26fb192394ac
EBUILD webkit-gtk-1.4.2-r300.ebuild 3744 RMD160 24a4953d4953077b0d32c000bce4d900efa0cf92 SHA1 5eb1b725d5c42c0d58e4b0c279b4283af007b1a7 SHA256 33212de6d2d14ca705e9fcb88b9909a28ab43a9b4b23a2ba98c884ada69ca4a7
-MISC ChangeLog 23259 RMD160 127720de413cf210960ef0f8145053d9933ea416 SHA1 1133c28c9fff9d065a343bcba16c49eeeea0fd1c SHA256 b7fdca91294355df3b126cc64dcb24035f6b8a83874447f3cb518e9030b4f631
+EBUILD webkit-gtk-1.4.3-r200.ebuild 3669 RMD160 7aa23fce2bbfb55de31a47d3c6954b7b9aad4a84 SHA1 cd15e18cb0a6cbe175b3585252908ea953b0a5b1 SHA256 8977f50d8949702d37305d56780c9fcde2a24d245bdc05168af20d36760a92cf
+EBUILD webkit-gtk-1.4.3-r300.ebuild 3854 RMD160 7a8e4fc9c9f7833255e7ab329efa3e1f50b68cc9 SHA1 b8c8d4c77974f624fc161b5889dac29819b74fdd SHA256 a9185817e2d5c6cc8f0fc81e9e28b6a14fd9d5727abe1237654e857c12c6c66e
+MISC ChangeLog 23565 RMD160 a81dd339abafcabecd078b8cd12c7e80280f334a SHA1 fe97c72ff62b45d0a27e703233970e62ed40e721 SHA256 c861fe9aeb50de2808e8a433e956db3f98e2fb50935446407d507f1f931e1565
MISC metadata.xml 439 RMD160 ed901542890ff2bf45ff3302f79b48cc0ba9e5f8 SHA1 746abe4ff5e3911f962a40f23fe1c521d32adca8 SHA256 57260da7cdd67c9be679d44a3deba705ff381fde47433b5d22ccd1402ecabdf3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk5eMx4ACgkQCaWpQKGI+9RVpACeO131XutUgFKS4+fp6T0ykQET
-eIAAn3InOt8/FpKZ9fTzLgZLIlsi1mg6
-=oEIy
+iEYEARECAAYFAk57gYgACgkQCaWpQKGI+9Q7MwCcD7022f26ZyehnSQQ3IIC+fDE
+0EUAniHpFyBW0QpUdAIARsuI+GRS2AVi
+=AIk1
-----END PGP SIGNATURE-----
--- /dev/null
+Index: /trunk/ChangeLog\r
+===================================================================\r
+--- /trunk/ChangeLog (revision 82570)\r
++++ /trunk/ChangeLog (revision 82599)\r
+@@ -1,2 +1,16 @@\r
++2011-03-31 Xan Lopez <xlopez@igalia.com>\r
++\r
++ Reviewed by Martin Robinson.\r
++\r
++ [GTK] Link explicitly with XRender on Linux/Unix\r
++ https://bugs.webkit.org/show_bug.cgi?id=57558\r
++\r
++ Some linkers, like GNU Gold, require explicit linkage of all the\r
++ libraries used instead of relying on our dependencies to bring\r
++ them in. In this case, the build fails because we use XRender in\r
++ the plugin code but don't link directly to it.\r
++\r
++ * configure.ac: check for XRender on UNIX.\r
++\r
+ 2011-03-31 Vamshikrishna.Yellenki <vamshi@motorola.com> and Alejandro G. Castro <alex@igalia.com>\r
+ \r
+Index: /trunk/Source/WebKit/gtk/GNUmakefile.am\r
+===================================================================\r
+--- /trunk/Source/WebKit/gtk/GNUmakefile.am (revision 80561)\r
++++ /trunk/Source/WebKit/gtk/GNUmakefile.am (revision 82599)\r
+@@ -103,4 +103,5 @@\r
+ $(SQLITE3_LIBS) \\r
+ $(UNICODE_LIBS) \\r
++ $(XRENDER_LIBS) \\r
+ $(XT_LIBS) \\r
+ $(WINMM_LIBS) \\r
+Index: /trunk/Source/WebKit/gtk/ChangeLog\r
+===================================================================\r
+--- /trunk/Source/WebKit/gtk/ChangeLog (revision 82582)\r
++++ /trunk/Source/WebKit/gtk/ChangeLog (revision 82599)\r
+@@ -1,2 +1,11 @@\r
++2011-03-31 Xan Lopez <xlopez@igalia.com>\r
++\r
++ Reviewed by Martin Robinson.\r
++\r
++ [GTK] Link explicitly with XRender on Linux/Unix\r
++ https://bugs.webkit.org/show_bug.cgi?id=57558\r
++\r
++ * GNUmakefile.am: add XRender LIBS.\r
++\r
+ 2011-03-31 Evan Martin <evan@chromium.org>\r
+ \r
+Index: /trunk/Source/WebCore/ChangeLog\r
+===================================================================\r
+--- /trunk/Source/WebCore/ChangeLog (revision 82597)\r
++++ /trunk/Source/WebCore/ChangeLog (revision 82599)\r
+@@ -1,2 +1,11 @@\r
++2011-03-31 Xan Lopez <xlopez@igalia.com>\r
++\r
++ Reviewed by Martin Robinson.\r
++\r
++ [GTK] Link explicitly with XRender on Linux/Unix\r
++ https://bugs.webkit.org/show_bug.cgi?id=57558\r
++\r
++ * GNUmakefile.am: add XRender CFLAGS.\r
++\r
+ 2011-03-31 Eric Seidel <eric@webkit.org>\r
+ \r
+Index: /trunk/Source/WebCore/GNUmakefile.am\r
+===================================================================\r
+--- /trunk/Source/WebCore/GNUmakefile.am (revision 82580)\r
++++ /trunk/Source/WebCore/GNUmakefile.am (revision 82599)\r
+@@ -5111,4 +5111,5 @@\r
+ $(SQLITE3_CFLAGS) \\r
+ $(UNICODE_CFLAGS) \\r
++ $(XRENDER_CFLAGS) \\r
+ $(XT_CFLAGS)\r
+ \r
+Index: /trunk/configure.ac\r
+===================================================================\r
+--- /trunk/configure.ac (revision 81641)\r
++++ /trunk/configure.ac (revision 82599)\r
+@@ -937,4 +937,12 @@\r
+ AC_SUBST([GEOCLUE_CFLAGS])\r
+ AC_SUBST([GEOCLUE_LIBS])\r
++fi\r
++\r
++# check for XRender under Linux/Unix. Some linkers require explicit\r
++# linkage (like GNU Gold), so we cannot rely on GTK+ pulling XRender\r
++if test "$os_win32" = "no"; then\r
++ PKG_CHECK_MODULES([XRENDER], [xrender])\r
++ AC_SUBST([XRENDER_CFLAGS])\r
++ AC_SUBST([XRENDER_LIBS])\r
+ fi\r
+ \r
--- /dev/null
+# Copyright 1999-2011 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.4.3-r200.ebuild,v 1.1 2011/09/22 18:42:10 pacho Exp $
+
+EAPI="4"
+
+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="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+IUSE="aqua coverage debug doc spell +gstreamer +introspection +jit"
+# bug 372493
+REQUIRED_USE="introspection? ( gstreamer )"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+RDEPEND="
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ virtual/jpeg
+ >=media-libs/libpng-1.4:0
+ x11-libs/cairo
+ >=dev-libs/glib-2.27.90:2
+ >=x11-libs/gtk+-2.13:2[aqua=,introspection?]
+ >=dev-libs/icu-3.8.1-r1
+ >=net-libs/libsoup-2.33.6:2.4[introspection?]
+ dev-db/sqlite:3
+ >=x11-libs/pango-1.12
+ x11-libs/libXrender
+
+ gstreamer? (
+ media-libs/gstreamer:0.10
+ >=media-libs/gst-plugins-base-0.10.25:0.10 )
+
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+ spell? ( >=app-text/enchant-0.22 )
+"
+DEPEND="${RDEPEND}
+ >=sys-devel/flex-2.5.33
+ sys-devel/gettext
+ virtual/yacc
+ dev-util/gperf
+ dev-util/pkgconfig
+ dev-util/gtk-doc-am
+ doc? ( >=dev-util/gtk-doc-1.10 )
+ test? ( x11-themes/hicolor-icon-theme )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ DOCS="Source/WebKit/gtk/NEWS Source/WebKit/gtk/ChangeLog"
+
+ # 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
+
+ # intermediate MacPorts hack while upstream bug is not fixed properly
+ # https://bugs.webkit.org/show_bug.cgi?id=28727
+ use aqua && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+
+ # Fix build on Darwin8 (10.4 Tiger)
+ # XXX: Fails to apply
+ #epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
+
+ # Don't force -O2
+ sed -i 's/-O2//g' "${S}"/configure.ac
+
+ # Don't build tests if not needed, part of bug #343249
+ # XXX: Fails to apply
+ #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+
+ # Prevent maintainer mode from being triggered during make
+ AT_M4DIR=Source/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 and co.
+ use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+
+ # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+ use ppc64 && append-flags "-mminimal-toc"
+
+ local myconf
+
+ # XXX: Check Web Audio support
+ # XXX: webgl fails compilation
+ # XXX: WebKit2 is the new out-of-process model, doesn't work yet
+ myconf="
+ $(use_enable coverage)
+ $(use_enable debug)
+ $(use_enable spell spellcheck)
+ $(use_enable introspection)
+ $(use_enable gstreamer video)
+ $(use_enable jit)
+ --disable-webgl
+ --with-gtk=2.0
+ --disable-webkit2
+ --disable-web-sockets
+ $(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+ # Disable web-sockets per bug #326547
+
+ econf ${myconf}
+}
+
+src_compile() {
+ # Fix sandbox error with USE="introspection"
+ # https://bugs.webkit.org/show_bug.cgi?id=35471
+ emake XDG_DATA_HOME="${T}/.local"
+}
+
+src_test() {
+ unset DISPLAY
+ # Tests need virtualx, bug #294691, bug #310695
+ # Set XDG_DATA_HOME for introspection tools, bug #323669
+ Xemake check XDG_DATA_HOME="${T}/.local"
+}
+
+src_install() {
+ default
+
+ # Remove .la files
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+}
--- /dev/null
+# Copyright 1999-2011 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.4.3-r300.ebuild,v 1.1 2011/09/22 18:42:10 pacho Exp $
+
+EAPI="4"
+
+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="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell"
+# bug 372493
+REQUIRED_USE="introspection? ( gstreamer )"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+# Aqua support in gtk3 is untested
+RDEPEND="
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ virtual/jpeg
+ >=media-libs/libpng-1.4:0
+ x11-libs/cairo
+ >=dev-libs/glib-2.27.90:2
+ >=x11-libs/gtk+-3.0:3[aqua=,introspection?]
+ >=dev-libs/icu-3.8.1-r1
+ >=net-libs/libsoup-2.33.6:2.4[introspection?]
+ dev-db/sqlite:3
+ >=x11-libs/pango-1.12
+ x11-libs/libXrender
+
+ gstreamer? (
+ media-libs/gstreamer:0.10
+ >=media-libs/gst-plugins-base-0.10.25:0.10 )
+
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+ spell? ( >=app-text/enchant-0.22 )
+"
+DEPEND="${RDEPEND}
+ >=sys-devel/flex-2.5.33
+ sys-devel/gettext
+ virtual/yacc
+ dev-util/gperf
+ dev-util/pkgconfig
+ dev-util/gtk-doc-am
+ doc? ( >=dev-util/gtk-doc-1.10 )
+ test? ( x11-themes/hicolor-icon-theme )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ DOCS="Source/WebKit/gtk/NEWS Source/WebKit/gtk/ChangeLog"
+
+ # Link explicitly with XRender on Linux/Unix, bug #371751
+ epatch "${FILESDIR}/${PN}-1.4.3-underlinking.patch"
+
+ # FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
+ # https://bugs.webkit.org/show_bug.cgi?id=19775
+ use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+
+ # intermediate MacPorts hack while upstream bug is not fixed properly
+ # https://bugs.webkit.org/show_bug.cgi?id=28727
+ use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
+
+ # Fix build on Darwin8 (10.4 Tiger)
+ # XXX: Fails to apply
+ #epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
+
+ # Don't force -O2
+ sed -i 's/-O2//g' "${S}"/configure.ac
+
+ # Don't build tests if not needed, part of bug #343249
+ # XXX: Fails to apply
+ #epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+
+ # Prevent maintainer mode from being triggered during make
+ AT_M4DIR=Source/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 and co.
+ use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+
+ # https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+ use ppc64 && append-flags "-mminimal-toc"
+
+ local myconf
+
+ # XXX: Check Web Audio support
+ # XXX: webgl fails compilation
+ # XXX: WebKit2 is the new out-of-process model, doesn't work yet
+ myconf="
+ $(use_enable coverage)
+ $(use_enable debug)
+ $(use_enable spell spellcheck)
+ $(use_enable introspection)
+ $(use_enable gstreamer video)
+ $(use_enable jit)
+ --disable-webgl
+ --with-gtk=3.0
+ --disable-webkit2
+ --disable-web-sockets
+ $(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+ # Aqua support in gtk3 is untested
+ # Disable web-sockets per bug #326547
+
+ econf ${myconf}
+}
+
+src_compile() {
+ # Fix sandbox error with USE="introspection"
+ # https://bugs.webkit.org/show_bug.cgi?id=35471
+ emake XDG_DATA_HOME="${T}/.local"
+}
+
+src_test() {
+ unset DISPLAY
+ # Tests need virtualx, bug #294691, bug #310695
+ # Set XDG_DATA_HOME for introspection tools, bug #323669
+ Xemake check XDG_DATA_HOME="${T}/.local"
+}
+
+src_install() {
+ default
+
+ # Remove .la files
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+}