From 46750b07eadb928fddb699bf5a46c9a166563203 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 5 Nov 2011 13:21:15 +0000 Subject: [PATCH] Drop old and stop trying to apply a patch that will be unable to be applied (even if patch exists, bug #389481). Package-Manager: portage-2.1.10.32/cvs/Linux x86_64 --- net-libs/webkit-gtk/ChangeLog | 8 +- net-libs/webkit-gtk/Manifest | 17 +-- net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild | 119 --------------- .../webkit-gtk/webkit-gtk-1.4.2-r200.ebuild | 135 ----------------- .../webkit-gtk/webkit-gtk-1.4.2-r300.ebuild | 137 ------------------ .../webkit-gtk/webkit-gtk-1.4.3-r200.ebuild | 6 +- .../webkit-gtk/webkit-gtk-1.4.3-r300.ebuild | 6 +- 7 files changed, 15 insertions(+), 413 deletions(-) delete mode 100644 net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild delete mode 100644 net-libs/webkit-gtk/webkit-gtk-1.4.2-r200.ebuild delete mode 100644 net-libs/webkit-gtk/webkit-gtk-1.4.2-r300.ebuild diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog index cf2eca38b06c..6075601f775b 100644 --- a/net-libs/webkit-gtk/ChangeLog +++ b/net-libs/webkit-gtk/ChangeLog @@ -1,6 +1,12 @@ # 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.129 2011/10/30 17:29:53 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.130 2011/11/05 13:21:15 pacho Exp $ + + 05 Nov 2011; Pacho Ramos -webkit-gtk-1.2.7.ebuild, + -webkit-gtk-1.4.2-r200.ebuild, -webkit-gtk-1.4.2-r300.ebuild, + webkit-gtk-1.4.3-r200.ebuild, webkit-gtk-1.4.3-r300.ebuild: + Drop old and stop trying to apply a patch that will be unable to be applied + (even if patch exists, bug #389481). 30 Oct 2011; Raúl Porcel webkit-gtk-1.4.3-r300.ebuild: alpha/ia64/sparc stable wrt #385699 diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest index 9fc18376db85..fdbae06fe8ae 100644 --- a/net-libs/webkit-gtk/Manifest +++ b/net-libs/webkit-gtk/Manifest @@ -7,23 +7,18 @@ AUX webkit-gtk-1.2.5-darwin8.patch 1152 RMD160 a546515b8a088f8f11e532662833c3e41 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 -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 DIST webkit-gtk-1.6.1.tar.xz 6416248 RMD160 ab63ea133ed2bd471c5faf012d4d284c324d6ff3 SHA1 13b976e736f09950ceeb6f1b0af00c52e9d8d475 SHA256 ca29992afb70d97301b8cf991ce58bf53523a71b5eb91134d998a458824a0339 -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 -EBUILD webkit-gtk-1.4.3-r200.ebuild 3663 RMD160 e3567f1d10839e37f071d7fcad3492aa90914d63 SHA1 a65aa4f61ef31e47dd58ab63cea6b9a50f2a71e8 SHA256 4c74b3a70d83811ac14dd7dad9ac3f693ce9bbd097fbef722c14fd5896f853f8 -EBUILD webkit-gtk-1.4.3-r300.ebuild 3735 RMD160 f88895db7ea3254fdc0e8bf4f9b64fe3fc0fe0b2 SHA1 9b0f840e139005b645ad4ce2f5334c7e3d5fb31d SHA256 5b5b1d54962bbe9f053f82c71c3db42ccc0af0d0fd55c691694b352824a595ed +EBUILD webkit-gtk-1.4.3-r200.ebuild 3489 RMD160 60dcca3f8ea8db6398c2e01e96119a44d28a6b80 SHA1 7d25b89803d208c7f0a7799659513ee8ff995966 SHA256 6380b001bf9077c2135453e3e45e947db2cbe9171fc2dcf9364bab1d25c13ac4 +EBUILD webkit-gtk-1.4.3-r300.ebuild 3559 RMD160 a508e11554ad3666d4180e94bfbef671cdfc59be SHA1 0cfa0a81eff8bded59f064fa787fdd716575b63f SHA256 7c94293468e42977281cdf3b7aa78e9c423ec35467256040473eadac17bd2760 EBUILD webkit-gtk-1.6.1-r200.ebuild 4178 RMD160 5fe6f89c0ee09e69a43a81b9343b007643cd66e1 SHA1 463e74ebcadb4ccef80ec28a24e7f762510c3083 SHA256 ed401ed3a61f95e01e9970562eec6e5cf8784f97fc64baa68abfcce9a202a4fe EBUILD webkit-gtk-1.6.1-r300.ebuild 4607 RMD160 4bbf1076fdf882bf3a65d1a25eec902d6a2b9476 SHA1 b29428a8e47d82823e76cd3a8fb1879444900938 SHA256 da1c4dde2a531631b146ce496f7a25dffb2dc756cdde24cd2676360ccfff2021 -MISC ChangeLog 25075 RMD160 3892d19d8989b45ae3173d38f3d3c7cd39cff710 SHA1 36b2d8b4925a29826cee4cac34fa67f2a65f3a84 SHA256 864a921d2fb7c126e072ceda53136daf8b2b794d4f94418d2d4d1dd56af943a9 +MISC ChangeLog 25389 RMD160 7b14499185aafe81ebd556936b352d4238b8cfce SHA1 685d34f2162bf73ad9a7130e2215b8280920cbe5 SHA256 b260baf575bbb00cd4be72dc51101d372b045df45b59175419d45c3292fca398 MISC metadata.xml 539 RMD160 422a84bfd5fd0ca7d32825e204b0a435a980ecd5 SHA1 33fe25bdc890c5e034d5dc02a82b028283e0cc03 SHA256 eb78ad3163ace16c943a2620ef1659d33913985b8a9584a2d734f021a82f7887 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk6tiZgACgkQuQc30/atMkBm3wCffwWqleutYBacyNJafFRIBWmo -xtMAoK78XVKLH6OLnzgOOlrYQCPi4XTC -=C4Zg +iEYEARECAAYFAk61OFEACgkQCaWpQKGI+9TBNQCfXhxk5BxPGMBQhjWeV6P0Add0 +Z78An1bMkIjNyDSm5zaNDqtP+5k4+PFo +=la6Y -----END PGP SIGNATURE----- diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild deleted file mode 100644 index ad8fd5668bba..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-1.2.7.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# 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.2.7.ebuild,v 1.8 2011/08/31 13:11:52 pacho Exp $ - -EAPI="3" - -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 is missing -IUSE="aqua coverage debug doc +gstreamer introspection +jit test" - -# use sqlite, svg by default -# dependency on >=x11-libs/gtk+-2.13 for gail -# XXX: Quartz patch does not apply -RDEPEND=" - dev-libs/libxml2 - dev-libs/libxslt - virtual/jpeg - >=media-libs/libpng-1.4 - x11-libs/cairo - >=x11-libs/gtk+-2.13:2[aqua=] - >=dev-libs/glib-2.21.3:2 - >=dev-libs/icu-3.8.1-r1 - >=net-libs/libsoup-2.29.90:2.4 - >=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 )" - -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 ) - test? ( x11-themes/hicolor-icon-theme )" - -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.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) - epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch - - # Don't force -O2 - sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed" - - # Don't build tests if not needed, part of bug #343249 - epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch" - - epatch "${FILESDIR}"/${P}-libpng15.patch - - # 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 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 - - myconf=" - --disable-introspection - --disable-web_sockets - $(use_enable coverage) - $(use_enable debug) - $(use_enable gstreamer video) - $(use_enable introspection) - $(use_enable jit) - $(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 -j1 XDG_DATA_HOME="${T}/.local" || die "Compile failed" -} - -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" || die "Test phase failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" - dodoc WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed" -} diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.2-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.2-r200.ebuild deleted file mode 100644 index b7be201f98d1..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-1.4.2-r200.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# 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.2-r200.ebuild,v 1.4 2011/08/14 06:43:26 nirbheek 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 '{}' + -} diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.2-r300.ebuild deleted file mode 100644 index 7fc64679df83..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-1.4.2-r300.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# 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.2-r300.ebuild,v 1.4 2011/08/14 06:43:26 nirbheek 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" - - # 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 '{}' + -} diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.3-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.3-r200.ebuild index ab13b7f658ff..6d620b57f47c 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.4.3-r200.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.4.3-r200.ebuild @@ -1,6 +1,6 @@ # 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.6 2011/10/30 17:27:57 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.4.3-r200.ebuild,v 1.7 2011/11/05 13:21:15 pacho Exp $ EAPI="4" @@ -59,10 +59,6 @@ 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 diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild index a646180bed25..a391ae4bad7c 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild @@ -1,6 +1,6 @@ # 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.7 2011/10/30 17:29:53 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.4.3-r300.ebuild,v 1.8 2011/11/05 13:21:15 pacho Exp $ EAPI="4" @@ -60,10 +60,6 @@ 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.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 -- 2.26.2