diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2011-04-17 23:47:46 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2011-04-17 23:47:46 +0000 |
| commit | 1f910fbb7809368e267465e709add72e97f675fd (patch) | |
| tree | 09e1d612208c0e2bbbd45cf1bafbacaa5aa6f88b /net-libs | |
| parent | Revision bump to add symlink (bug #348497), bump to EAPI 4, and remove old. (diff) | |
| download | gentoo-2-1f910fbb7809368e267465e709add72e97f675fd.tar.gz gentoo-2-1f910fbb7809368e267465e709add72e97f675fd.tar.bz2 gentoo-2-1f910fbb7809368e267465e709add72e97f675fd.zip | |
Update patchset to support libpng-1.5 and gcc-4.6
(Portage version: 2.1.9.46/cvs/Linux x86_64)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/xulrunner/ChangeLog | 5 | ||||
| -rw-r--r-- | net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch | 25 | ||||
| -rw-r--r-- | net-libs/xulrunner/xulrunner-2.0-r1.ebuild | 6 |
3 files changed, 6 insertions, 30 deletions
diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog index a140581f7bc2..7360ca9946bc 100644 --- a/net-libs/xulrunner/ChangeLog +++ b/net-libs/xulrunner/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-libs/xulrunner # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.408 2011/04/10 11:21:54 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.409 2011/04/17 23:47:46 anarchy Exp $ + + 17 Apr 2011; Jory A. Pratt <anarchy@gentoo.org> xulrunner-2.0-r1.ebuild: + Update patchset to support libpng-1.5 and gcc-4.6 10 Apr 2011; Raúl Porcel <armin76@gentoo.org> xulrunner-1.9.2.16.ebuild: alpha/ia64 stable wrt #360055 diff --git a/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch b/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch deleted file mode 100644 index 464e1e118f99..000000000000 --- a/net-libs/xulrunner/files/mozilla-2.0-gconf-config-update.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -5701,16 +5701,21 @@ then - - AC_SUBST(MOZ_ENABLE_GIO) - AC_SUBST(MOZ_GIO_CFLAGS) - AC_SUBST(MOZ_GIO_LIBS) - - dnl ======================================================== - dnl = GConf support module - dnl ======================================================== -+ MOZ_ARG_DISABLE_BOOL(gconf, -+ [ --disable-gconf Disable Gconf support ], -+ MOZ_ENABLE_GCONF=, -+ MOZ_ENABLE_GCONF=force) -+ - if test "$MOZ_ENABLE_GCONF" - then - PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[ - MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'` - MOZ_ENABLE_GCONF=1 - ],[ - if test "$MOZ_ENABLE_GCONF" = "force" - then diff --git a/net-libs/xulrunner/xulrunner-2.0-r1.ebuild b/net-libs/xulrunner/xulrunner-2.0-r1.ebuild index 7f689d908a2a..b63ca007a4f8 100644 --- a/net-libs/xulrunner/xulrunner-2.0-r1.ebuild +++ b/net-libs/xulrunner/xulrunner-2.0-r1.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/xulrunner/xulrunner-2.0-r1.ebuild,v 1.1 2011/04/04 02:12:32 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0-r1.ebuild,v 1.2 2011/04/17 23:47:46 anarchy Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -14,7 +14,7 @@ FF_PV="${FF_PV/_alpha/a}" # Handle alpha for SRC_URI FF_PV="${FF_PV/_beta/b}" # Handle beta for SRC_URI FF_PV="${FF_PV/_rc/rc}" # Handle rc for SRC_URI CHANGESET="e56ecd8b3a68" -PATCH="${PN}-2.0-patches-1.3" +PATCH="${PN}-2.0-patches-1.6" DESCRIPTION="Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications" HOMEPAGE="http://developer.mozilla.org/en/docs/XULRunner" @@ -65,8 +65,6 @@ src_prepare() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}" - epatch "${FILESDIR}"/mozilla-2.0-gconf-config-update.patch - # Allow user to apply any additional patches without modifing ebuild epatch_user |