diff options
author | Pacho Ramos <pacho@gentoo.org> | 2011-01-15 13:56:26 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2011-01-15 13:56:26 +0000 |
commit | 081091422c804e8c0678ed30ce93e0f2632776cc (patch) | |
tree | a016034b6f4dbdbdc8f294a4d05e837556c04a48 /net-libs/webkit-gtk | |
parent | Removed old (diff) | |
download | gentoo-2-081091422c804e8c0678ed30ce93e0f2632776cc.tar.gz gentoo-2-081091422c804e8c0678ed30ce93e0f2632776cc.tar.bz2 gentoo-2-081091422c804e8c0678ed30ce93e0f2632776cc.zip |
Filter -mvis on sparc due bug #351561, thanks to Alex Buell. Remove old.
(Portage version: 2.1.9.31/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/webkit-gtk')
-rw-r--r-- | net-libs/webkit-gtk/ChangeLog | 6 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild | 116 | ||||
-rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-1.2.6.ebuild | 6 |
3 files changed, 8 insertions, 120 deletions
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog index 0ed85493a5f3..62bd02b028c7 100644 --- a/net-libs/webkit-gtk/ChangeLog +++ b/net-libs/webkit-gtk/ChangeLog @@ -1,6 +1,10 @@ # 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.98 2011/01/15 12:10:57 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.99 2011/01/15 13:56:25 pacho Exp $ + + 15 Jan 2011; Pacho Ramos <pacho@gentoo.org> -webkit-gtk-1.2.3.ebuild, + webkit-gtk-1.2.6.ebuild: + Filter -mvis on sparc due bug #351561, thanks to Alex Buell. Remove old. 15 Jan 2011; Markus Meier <maekke@gentoo.org> webkit-gtk-1.2.6.ebuild: arm stable, bug #350598 diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild deleted file mode 100644 index b3c24cca57ac..000000000000 --- a/net-libs/webkit-gtk/webkit-gtk-1.2.3.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# 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.9 2010/12/29 22:41:40 nirbheek 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="2" -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 - virtual/jpeg - >=media-libs/libpng-1.4 - 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.2.3-fix-pool-sparc.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" -} diff --git a/net-libs/webkit-gtk/webkit-gtk-1.2.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.2.6.ebuild index 82ef330ec58c..e34f4135f740 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.2.6.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.2.6.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.2.6.ebuild,v 1.7 2011/01/15 12:10:57 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.2.6.ebuild,v 1.8 2011/01/15 13:56:26 pacho Exp $ EAPI="3" @@ -76,8 +76,8 @@ 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=*" + # 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" |