diff options
| author |   Jory Pratt <anarchy@gentoo.org> | 2012-05-24 01:48:03 +0000 |
|---|---|---|
| committer | Jory Pratt <anarchy@gentoo.org> | 2012-05-24 01:48:03 +0000 |
| commit | 31af8952149e6c91dc46a23279116f9f0d5ba0b0 (patch) | |
| tree | 3887f39ad5264511474e68c3092bf7102ba60077 /mail-client | |
| parent | Fix local gettext desync issues #417265 by hendrik. (diff) | |
| download | gentoo-2-31af8952149e6c91dc46a23279116f9f0d5ba0b0.tar.gz gentoo-2-31af8952149e6c91dc46a23279116f9f0d5ba0b0.tar.bz2 gentoo-2-31af8952149e6c91dc46a23279116f9f0d5ba0b0.zip | |
add jit useflag, sync patchset with firefox
(Portage version: 2.1.10.62/cvs/Linux x86_64)
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/thunderbird/ChangeLog | 8 | ||||
| -rw-r--r-- | mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild (renamed from mail-client/thunderbird/thunderbird-12.0.1.ebuild) | 27 |
2 files changed, 27 insertions, 8 deletions
diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog index cc4ff823ab86..49de7572baa6 100644 --- a/mail-client/thunderbird/ChangeLog +++ b/mail-client/thunderbird/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for mail-client/thunderbird # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.141 2012/05/08 09:26:50 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.142 2012/05/24 01:48:03 anarchy Exp $ + +*thunderbird-12.0.1-r1 (24 May 2012) + + 24 May 2012; Jory A. Pratt <anarchy@gentoo.org> -thunderbird-12.0.1.ebuild, + +thunderbird-12.0.1-r1.ebuild: + Add jit useflag fix patchset from firefox 08 May 2012; Lars Wendler <polynomial-c@gentoo.org> thunderbird-12.0.1.ebuild: diff --git a/mail-client/thunderbird/thunderbird-12.0.1.ebuild b/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild index d5befa31dc33..008e8bee5561 100644 --- a/mail-client/thunderbird/thunderbird-12.0.1.ebuild +++ b/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-12.0.1.ebuild,v 1.4 2012/05/08 09:26:50 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild,v 1.1 2012/05/24 01:48:03 anarchy Exp $ EAPI="3" WANT_AUTOCONF="2.1" @@ -33,10 +33,10 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/" KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" SLOT="0" LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE="bindist gconf +crashreporter +crypt +ipc +lightning +minimal mozdom +webm" +IUSE="bindist gconf +crashreporter +crypt +ipc +jit +lightning +minimal mozdom +webm" PATCH="thunderbird-10.0-patches-0.1" -PATCHFF="firefox-12.0-patches-0.1" +PATCHFF="firefox-12.0-patches-0.3" SRC_URI="${SRC_URI} ${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2 @@ -168,11 +168,14 @@ src_configure() { mozconfig_annotate '' --with-system-png mozconfig_annotate '' --enable-system-ffi mozconfig_annotate '' --target="${CTARGET:-${CHOST}}" - mozconfig_annotate 'Missing fetures' --disable-system-cairo + mozconfig_annotate 'Missing features' --disable-system-cairo # Use enable features mozconfig_use_enable lightning calendar mozconfig_use_enable gconf + # Both methodjit and tracejit conflict with PaX + mozconfig_use_enable jit methodjit + mozconfig_use_enable jit tracejit # Bug #72667 if use mozdom; then @@ -228,8 +231,11 @@ src_install() { cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \ "${S}/${obj_dir}/mozilla/dist/bin/defaults/pref/all-gentoo.js" || die - # Pax mark xpcshell for hardened support, only used for startupcache creation. - pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell + # Without methodjit and tracejit there's no conflict with PaX + if use jit; then + # Pax mark xpcshell for hardened support, only used for startupcache creation. + pax-mark m "${S}"/${obj_dir}/mozilla/dist/bin/xpcshell + fi emake DESTDIR="${D}" install || die "emake install failed" @@ -281,8 +287,15 @@ src_install() { -i "${ED}"/usr/share/applications/${PN}.desktop fi - pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/thunderbird-bin + if use jit ; then + pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin} + fi + + # Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash + # continue to work as expected. + pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container + # Plugins dir share_plugins_dir if use minimal; then |