diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2007-03-07 13:36:01 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2007-03-07 13:36:01 +0000 |
| commit | e2e2ea7bc5e34c4a6b6047db55485da777536b1d (patch) | |
| tree | 062e8ab83011420828c7a5c8a52f1b2552fa869e /app-office/mozilla-sunbird | |
| parent | Remove arts dep for bug 127609 (diff) | |
| download | gentoo-2-e2e2ea7bc5e34c4a6b6047db55485da777536b1d.tar.gz gentoo-2-e2e2ea7bc5e34c4a6b6047db55485da777536b1d.tar.bz2 gentoo-2-e2e2ea7bc5e34c4a6b6047db55485da777536b1d.zip | |
Add patchset to fix bug 165777 and bug 168893
(Portage version: 2.1.2.1-r1)
Diffstat (limited to 'app-office/mozilla-sunbird')
4 files changed, 18 insertions, 20 deletions
diff --git a/app-office/mozilla-sunbird/ChangeLog b/app-office/mozilla-sunbird/ChangeLog index de1da5a225e0..d6e82d8ff88a 100644 --- a/app-office/mozilla-sunbird/ChangeLog +++ b/app-office/mozilla-sunbird/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/mozilla-sunbird # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.5 2007/03/04 07:20:40 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.6 2007/03/07 13:36:01 armin76 Exp $ + + 07 Mar 2007; Raúl Porcel <armin76@gentoo.org> + -files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch, + mozilla-sunbird-0.3.1.ebuild: + Add patchset to fix bug 165777 and bug 168893 04 Mar 2007; Marius Mauch <genone@gentoo.org> mozilla-sunbird-0.3.1.ebuild: diff --git a/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1 b/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1 index c80bc01aef1b..8f124cafd8c9 100644 --- a/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1 +++ b/app-office/mozilla-sunbird/files/digest-mozilla-sunbird-0.3.1 @@ -1,3 +1,6 @@ +MD5 179b471c6c4b3291333ea3f9054a5abb mozilla-sunbird-0.3.1-patches-0.1.tar.bz2 7278 +RMD160 9581a3e0e5c4046b66c3c55b9ac0e6450236cc17 mozilla-sunbird-0.3.1-patches-0.1.tar.bz2 7278 +SHA256 17db0a41a69f27314863224ced2ddaf969b25ec8fb1655a1658322cf7c8dcfc2 mozilla-sunbird-0.3.1-patches-0.1.tar.bz2 7278 MD5 742c4b70cbef579fa99e0409156c0bb3 sunbird-0.3.1.ca.langpack.xpi 97999 RMD160 6fd1af114e4f07931e6e32d43bc7a9bc330e8ee1 sunbird-0.3.1.ca.langpack.xpi 97999 SHA256 b84be9cb13e964b5dc1da857df19c78b946f4b4e4b4f8967527582873b9857ae sunbird-0.3.1.ca.langpack.xpi 97999 diff --git a/app-office/mozilla-sunbird/files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch b/app-office/mozilla-sunbird/files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch deleted file mode 100644 index 6452dc829556..000000000000 --- a/app-office/mozilla-sunbird/files/mozilla-sunbird-0.3-add-missing-LDFLAGS.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- layout/build/Makefile.in.orig 2007-02-12 20:42:13.000000000 +0100 -+++ layout/build/Makefile.in 2007-02-12 20:49:48.000000000 +0100 -@@ -291,6 +291,7 @@ - endif - endif - -+LDFLAGS += -lX11 -lXrender - - export:: $(BUILD_DATE) - diff --git a/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild b/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild index f7aeb5a373ac..f0d36c3f178c 100644 --- a/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild +++ b/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild,v 1.4 2007/03/04 07:20:40 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.3.1.ebuild,v 1.5 2007/03/07 13:36:01 armin76 Exp $ WANT_AUTOCONF="2.1" inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools +PATCH="${P}-patches-0.1" LANGS="ca cs da de es-ES eu fr hu it mn nl pl ru sk sl" MY_PN="${PN/mozilla-}" @@ -13,13 +14,9 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="The Mozilla Sunbird Calendar" HOMEPAGE="http://www.mozilla.org/projects/calendar/sunbird.html" IUSE="bindist" -SRC_URI="http://releases.mozilla.org/pub/mozilla.org/calendar/${MY_PN}/releases/${PV}/source/${MY_P}.source.tar.bz2" +SRC_URI="http://releases.mozilla.org/pub/mozilla.org/calendar/${MY_PN}/releases/${PV}/source/${MY_P}.source.tar.bz2 + mirror://gentoo/${PATCH}.tar.bz2" -# These are in -# -# http://releases.mozilla.org/pub/mozilla.org/calendar/sunbird/releases/${PV}/langpacks/ -# -# for i in $LANGS $SHORTLANGS; do wget $i.xpi -O ${P}-$i.xpi; done for X in ${LANGS} ; do SRC_URI="${SRC_URI} linguas_${X/-/_}? ( http://releases.mozilla.org/pub/mozilla.org/calendar/${MY_PN}/releases/${PV}/langpacks/${MY_PN}-${PV}.${X}.langpack.xpi )" @@ -82,8 +79,11 @@ src_unpack() { [[ ${X} != "en" ]] && xpi_unpack "${MY_PN}-${PV}.${X}.langpack.xpi" done - cd "${S}" - epatch "${FILESDIR}/${PN}-0.3-add-missing-LDFLAGS.patch" + # Apply our patches + cd "${S}" || die "cd failed" + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}"/patch eautoreconf } |