diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2010-09-10 06:48:36 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2010-09-10 06:48:36 +0000 |
| commit | fdb82257f5ee4da662a284e3740f7499efcb3e8a (patch) | |
| tree | c7b5742bcbcd69d17520646688ea3c6df3540fb7 /www-client/icecat | |
| parent | Bug #336469 - Bump podofo dependency to 0.8.2. (diff) | |
| download | gentoo-2-fdb82257f5ee4da662a284e3740f7499efcb3e8a.tar.gz gentoo-2-fdb82257f5ee4da662a284e3740f7499efcb3e8a.tar.bz2 gentoo-2-fdb82257f5ee4da662a284e3740f7499efcb3e8a.zip | |
Use new firefox patchset tarball.
(Portage version: 2.2_rc78/cvs/Linux x86_64)
Diffstat (limited to 'www-client/icecat')
| -rw-r--r-- | www-client/icecat/ChangeLog | 5 | ||||
| -rw-r--r-- | www-client/icecat/files/402-oggzfbsd.patch | 11 | ||||
| -rw-r--r-- | www-client/icecat/icecat-3.6.9.ebuild | 18 |
3 files changed, 8 insertions, 26 deletions
diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog index 3e6581506a7f..be5f0fca3d40 100644 --- a/www-client/icecat/ChangeLog +++ b/www-client/icecat/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/icecat # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.41 2010/09/09 17:19:34 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.42 2010/09/10 06:48:36 polynomial-c Exp $ + + 10 Sep 2010; Lars Wendler <polynomial-c@gentoo.org> icecat-3.6.9.ebuild: + Use new firefox patchset tarball. 09 Sep 2010; Christian Faulhammer <fauli@gentoo.org> icecat-3.6.9.ebuild: stable x86, security bug 336396 diff --git a/www-client/icecat/files/402-oggzfbsd.patch b/www-client/icecat/files/402-oggzfbsd.patch deleted file mode 100644 index 83d0db89e990..000000000000 --- a/www-client/icecat/files/402-oggzfbsd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/media/liboggz/include/oggz/oggz_off_t_generated.h -+++ b/media/liboggz/include/oggz/oggz_off_t_generated.h -@@ -59,7 +59,7 @@ - - #include <sys/types.h> - --#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) -+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined(__FreeBSD__) - typedef off_t oggz_off_t; - #else - typedef loff_t oggz_off_t; diff --git a/www-client/icecat/icecat-3.6.9.ebuild b/www-client/icecat/icecat-3.6.9.ebuild index 81f7cde0d61a..00debb541f31 100644 --- a/www-client/icecat/icecat-3.6.9.ebuild +++ b/www-client/icecat/icecat-3.6.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.9.ebuild,v 1.4 2010/09/09 17:19:34 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.9.ebuild,v 1.5 2010/09/10 06:48:36 polynomial-c Exp $ EAPI="2" WANT_AUTOCONF="2.1" @@ -19,9 +19,9 @@ MAJ_PV="${PV/_*/}" # Without the _rc and _beta stuff DESKTOP_PV="3.6" MY_PV="${PV/_rc/rc}" # Handle beta for SRC_URI XUL_PV="${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version no.s -FIREFOX_PN="mozilla-firefox" +FIREFOX_PN="firefox" FIREFOX_P="${FIREFOX_PN}-${PV}" -PATCH="${FIREFOX_PN}-3.6-patches-0.6" +PATCH="${FIREFOX_PN}-3.6-patches-0.2" DESCRIPTION="GNU project's edition of Mozilla Firefox" HOMEPAGE="http://www.gnu.org/software/gnuzilla/" @@ -32,7 +32,7 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE="+alsa +cups +ipc java libnotify system-sqlite wifi" SRC_URI="mirror://gnu/gnuzilla/${MY_PV}/${PN}-${MY_PV}.tar.bz2 - http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2" + http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" LANGPACK_URI="http://gnuzilla.gnu.org/download/langpacks/" for X in ${LANGS} ; do @@ -129,18 +129,8 @@ src_prepare() { # Apply our patches EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ - EPATCH_EXCLUDE="137-bz460917_att350845_reload_new_plugins-gentoo-update.patch - 402-oggzfbsd.patch" \ epatch "${WORKDIR}" - epatch "${FILESDIR}"/402-oggzfbsd.patch - - # The patch excluded above failed, ported patch is applied below - epatch "${FILESDIR}/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch" - - # Enable tracemonkey for amd64 (bug #315997) - epatch "${FILESDIR}/801-enable-x86_64-tracemonkey.patch" - # Fix rebranding sed -i 's|\$(DIST)/bin/firefox|\$(DIST)/bin/icecat|' browser/app/Makefile.in |