From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/
Date: Mon, 7 May 2012 12:15:34 +0000 (UTC) [thread overview]
Message-ID: <1336392867.c4d5540ac678a833a43252e0490b375c8610a9a8.anarchy@gentoo> (raw)
commit: c4d5540ac678a833a43252e0490b375c8610a9a8
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon May 7 12:14:27 2012 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon May 7 12:14:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=c4d5540a
add jit useflag, update yasm patch for archs not supported with pcre
---
mail-client/thunderbird/Manifest | 4 +-
mail-client/thunderbird/thunderbird-12.0.1.ebuild | 20 ++++++++++++-----
www-client/firefox/Manifest | 4 +-
www-client/firefox/firefox-12.0.ebuild | 23 ++++++++++++++------
4 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 540acc3..80098f4 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -4,7 +4,7 @@ AUX thunderbird-gentoo-default-prefs-1.js-1 426 RMD160 0f59e73d7e5e171c9ce3774a8
DIST enigmail-1.3.5.tar.gz 1348362 RMD160 9aa3cdd7b8f16f4cb15e3b6f63c5ac913ddaac3f SHA1 4cc928ce2fc328cf6aefbf0c7161484405dbbb5e SHA256 932a0206e9598eb10056f94622e9c0a64afc93542b43694568df810208a1e3b2
DIST enigmail-1.4.1.tar.gz 1344516 RMD160 f235e266acd390992f128a20f73288c2ecc3c5a5 SHA1 5c629a5d06e23c5bebb86c840f44f04f0732dbda SHA256 100bc7f9ac6bca03e4507df25c5b29d6a39d0904c46301cc7def3676779d720b
DIST firefox-10.0-patches-0.7.tar.xz 17792 RMD160 0944a903821af98617b29fda4fb0f6fcecf28040 SHA1 6d67d372b8f4935114a8d0c72e369e55114373a1 SHA256 81b78f4ee19a70b4190484be0b6938c05a799202b6de35cfcad66eb79dc44bf9
-DIST firefox-12.0-patches-0.1.tar.xz 12996 RMD160 cd0c534410b512ca13504106465712ae51b4e5f0 SHA1 7ce3f371f43e73deca289a354dd9155b6a9bc8ff SHA256 de8573ad0019fd9b09bd94aefb3519286a04252a9d761bbf96f4c77d3c135174
+DIST firefox-12.0-patches-0.2.tar.xz 11528 RMD160 7421b1c48f22bef9b5a37ea084c5755672fdc96c SHA1 8117e20cb51cd7e2c39d8774515f583d1dded7b3 SHA256 7b478bec5ae03a51d08de5c19e7d71c668c566a359f694ab47f8d02e7f52a03f
DIST thunderbird-10.0-patches-0.1.tar.xz 860 RMD160 88bec4475cf92181abb0a2cccacb3561b0d6d21c SHA1 9a0a69838eb9c7a65497d525b587456ee768c4df SHA256 22dd2e4c1787fece81a8ab4d596b890027c2d390b4021ddc135349214f33932e
DIST thunderbird-10.0.3esr-ar.xpi 441462 RMD160 5c766a06764de46f12f047de4f1f25d291a0fd68 SHA1 5173b44d9e4af36fcb9c0fe37c0cdd907ecc7e56 SHA256 35cb4a50b24558d44a9473b0a247e7228e9e06c77ccd59398a09bd4e2aa4bcf2
DIST thunderbird-10.0.3esr-ast.xpi 362706 RMD160 0a7df1c5dd8909448b4079116cc2892e0a2f65d1 SHA1 f48f456c2bf5df19f62b581fdbdb4ff4f3660469 SHA256 db64f4f9e7475ac97a0f080628a423bcd7a65b25c7cd5e5f2a4aa6ddd0b6e6c9
@@ -113,4 +113,4 @@ DIST thunderbird-12.0.1-zh-CN.xpi 431545 RMD160 bd8ea0294775358f1125984417c3ac21
DIST thunderbird-12.0.1-zh-TW.xpi 432164 RMD160 4efb04c31feb828d86df5a3b649718f98281e37d SHA1 6d4eff3e899d4d3c5ec34996b264c4660e2182b6 SHA256 e0cb1c64a3b33ba741d46daeeaf3287a1c7d4551dafcda09134d7eb049cee104
DIST thunderbird-12.0.1.source.tar.bz2 101253776 RMD160 5df12513dd8d3554e666ff938b84a67b18a78144 SHA1 b5fcfe23834722eaa441274e0e2882adf9ed7575 SHA256 d8914f27b0ec71d940475a8942c951b106ecda69fd3a2954047584663a6ab183
EBUILD thunderbird-10.0.3.ebuild 8814 RMD160 2b1b7335d291fe0ada466fd32392c35fd4e4792b SHA1 f3cbc4f6bbdaef3a272b3e0778bf73bc5cd00dc8 SHA256 f37c1f12de6db5970339ce1fd3df1a8541a19288e5785734178bfcb0ff5f51c2
-EBUILD thunderbird-12.0.1.ebuild 9109 RMD160 25108a660cb6d05b09672d676a26e32261967d48 SHA1 11f31d4062590b697586450c9cf87bbd9a7ce913 SHA256 c1610cda4602ebb6e3d215e6859add8559353495ae1091753c9499566ec80fb2
+EBUILD thunderbird-12.0.1.ebuild 9365 RMD160 77b75f5dafa0d54a6f5cbfb57908ef9d0d849eb7 SHA1 09387cc51c8a315e2ba20665ac431d5c1c362161 SHA256 02139f369ee53226f07f74b9f3fb1a64ac287899e243bbca1d3d66968aea2c65
diff --git a/mail-client/thunderbird/thunderbird-12.0.1.ebuild b/mail-client/thunderbird/thunderbird-12.0.1.ebuild
index c9c3365..eabe8a1 100644
--- a/mail-client/thunderbird/thunderbird-12.0.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-12.0.1.ebuild
@@ -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.2"
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,7 +287,9 @@ 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,plugin-container}
+ fi
share_plugins_dir
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 287b087..5e2870c 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -147,7 +147,7 @@ DIST firefox-12.0-nn-NO.xpi 251584 RMD160 041e66421f6743e0ce8629a0695702ef1dcf5f
DIST firefox-12.0-nso.xpi 255057 RMD160 29e2594a03922f52810292b9598edda7e8ee4044 SHA1 d18938e88f74cf0c466a19305b58835cb88b9dc3 SHA256 80e3b19980b9bcfeb2754008dece354daa2001a9c16e18f85720b0fe454416a6
DIST firefox-12.0-or.xpi 290264 RMD160 b67ad0647f050a8d28a0376b9de333e74098b81d SHA1 32a70a795b62377ed0c7cea417fe68aef043d6ce SHA256 8e7050a78db20ab5476e483d86c21b901c22c040a5797ad6080a1c8b404e5a28
DIST firefox-12.0-pa-IN.xpi 291378 RMD160 9e16a42b5be9babf74d5b9a3f2db27a815fbdd74 SHA1 85f035b396acf7712903a7504809593edf7c1597 SHA256 6bf483528825485b7fd6ff8d8b25c63f298db64b3478e8a7e086bc8d4a083c29
-DIST firefox-12.0-patches-0.1.tar.xz 12996 RMD160 cd0c534410b512ca13504106465712ae51b4e5f0 SHA1 7ce3f371f43e73deca289a354dd9155b6a9bc8ff SHA256 de8573ad0019fd9b09bd94aefb3519286a04252a9d761bbf96f4c77d3c135174
+DIST firefox-12.0-patches-0.2.tar.xz 11528 RMD160 7421b1c48f22bef9b5a37ea084c5755672fdc96c SHA1 8117e20cb51cd7e2c39d8774515f583d1dded7b3 SHA256 7b478bec5ae03a51d08de5c19e7d71c668c566a359f694ab47f8d02e7f52a03f
DIST firefox-12.0-pl.xpi 260629 RMD160 65079485d604c9b7b7d78ea0c34eb941c63fadc4 SHA1 970dcc47edf23e99c8695313c66757bad2f3c4a2 SHA256 84382b1ba9208e9fdcb4529ce8327c9b06ccc78bbfb9535c916781548892b8a2
DIST firefox-12.0-pt-BR.xpi 256574 RMD160 0fe053715bc373d79de22279a5aa2a899b3988db SHA1 b846381743676685a833650b20fac819be4eb1aa SHA256 d535c55943207c1edc2d1009f44e74b6cc45c15d32f1b2d32c1d3b2e64384ed5
DIST firefox-12.0-pt-PT.xpi 255627 RMD160 10d04a1014da862f2260ffac2f9578e2c6a51fe1 SHA1 0950af9b2b99f29744f82689cc63b6833b6c389e SHA256 16bef61dd49c2c9fdc1263576d1e9275c98e94d7ea744cb551a10a9b9e5a7180
@@ -173,4 +173,4 @@ DIST firefox-12.0-zh-TW.xpi 267735 RMD160 937efdf1bdefffcfb514247bd2779fa66fb1a2
DIST firefox-12.0-zu.xpi 255708 RMD160 42b5013ff842ed74bcb70bacf338b6239340a1c6 SHA1 4ac34cc274ad7a94904f05bb768d8b412bf72ce6 SHA256 8491b0e6c1f4b5dff38f715d38c44ed267816bb053149193d958c43b6ca65bbb
DIST firefox-12.0.source.tar.bz2 78956707 RMD160 d83eb97543fc09f84b30a46ba8217c17f30bd572 SHA1 0177185e54b7d63dc36bd5bd5c80ba6afd52e199 SHA256 9a232a10e5803b0e4a85bd986e3e88b87ccde7bdc3363ea7022d5761944dbb1d
EBUILD firefox-10.0.3.ebuild 10575 RMD160 7fb8ae16dbfb9812e37e86b3a66ba2c343a386ca SHA1 6c98faed4c79eafc87de331796eea9eb2669ccb0 SHA256 55d3a04a7e454e2f4d07fcc0a9994600d83b2acc84307306f9fa1d2d9b7778fc
-EBUILD firefox-12.0.ebuild 10664 RMD160 ac0e15633167a2daca130f0766a9c066f3007986 SHA1 2f0c7edf0e4b628fe4b6470ff111466395308afa SHA256 925a1bd7bdd4aeb6dab9aabac9d074d3bf95fa0d94a4d4c8b57f8629600d7140
+EBUILD firefox-12.0.ebuild 10964 RMD160 45d7be7fa1f507fe37d946e6004d93ccd2893075 SHA1 cf96dd662c2a0fc6928f9446c4c8cca53823784e SHA256 6cb4133994a0ee5a039bf52d3be56e2e61892f73578fdd59f40a4f2ed1fc9cc7
diff --git a/www-client/firefox/firefox-12.0.ebuild b/www-client/firefox/firefox-12.0.ebuild
index b118ec6..d775544 100644
--- a/www-client/firefox/firefox-12.0.ebuild
+++ b/www-client/firefox/firefox-12.0.ebuild
@@ -27,7 +27,7 @@ fi
# Changeset for alpha snapshot
CHANGESET="e56ecd8b3a68"
# Patch version
-PATCH="${PN}-12.0-patches-0.1"
+PATCH="${PN}-12.0-patches-0.2"
# Upstream ftp release URI that's used by mozlinguas.eclass
# We don't use the http mirror because it deletes old tarballs.
MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
@@ -40,7 +40,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="bindist +crashreporter +ipc +minimal pgo selinux system-sqlite +webm"
+IUSE="bindist +crashreporter +ipc +jit +minimal pgo selinux system-sqlite +webm"
# More URIs appended below...
SRC_URI="${SRC_URI}
@@ -201,13 +201,16 @@ src_configure() {
mozconfig_annotate '' --enable-safe-browsing
mozconfig_annotate '' --with-system-png
mozconfig_annotate '' --enable-system-ffi
- mozconfig_annotate 'Missing fetures' --disable-system-cairo
+ mozconfig_annotate 'Missing features' --disable-system-cairo
# Other ff-specific settings
mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
mozconfig_use_enable system-sqlite
+ # Both methodjit and tracejit conflict with PaX
+ mozconfig_use_enable jit methodjit
+ mozconfig_use_enable jit tracejit
# Allow for a proper pgo build
if use pgo; then
@@ -269,8 +272,11 @@ src_install() {
obj_dir="${obj_dir%/*}"
cd "${S}/${obj_dir}"
- # Pax mark xpcshell for hardened support, only used for startupcache creation.
- pax-mark m "${S}/${obj_dir}"/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}"/dist/bin/xpcshell
+ fi
# Add our default prefs for firefox + xulrunner
cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
@@ -316,8 +322,11 @@ src_install() {
echo "StartupNotify=true" >> "${ED}/usr/share/applications/${PN}.desktop"
fi
- # Required in order to use plugins and even run firefox on hardened.
- pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+ # Without methodjit and tracejit there's no conflict with PaX
+ if use jit; then
+ # Required in order to use plugins and even run firefox on hardened.
+ pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+ fi
# Plugins dir
share_plugins_dir
next reply other threads:[~2012-05-07 12:15 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-07 12:15 Jory Pratt [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-08-27 13:28 [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/ Ian Stakenvicius
2017-12-13 0:40 Jory Pratt
2017-02-10 1:28 Jory Pratt
2015-05-30 2:57 Jory Pratt
2015-01-05 4:44 Jory Pratt
2014-09-03 22:07 Ian Stakenvicius
2014-06-14 0:27 Ian Stakenvicius
2014-04-30 2:28 Jory Pratt
2014-03-20 15:58 Lars Wendler
2013-12-15 21:02 Jory Pratt
2013-12-11 23:16 Jory Pratt
2013-10-31 3:41 Jory Pratt
2013-10-26 2:17 Jory Pratt
2013-09-24 22:34 Jory Pratt
2013-09-22 22:59 Jory Pratt
2013-08-07 2:24 Jory Pratt
2013-06-26 13:41 Jory Pratt
2013-06-10 12:26 Jory Pratt
2013-05-15 3:09 Jory Pratt
2013-04-22 1:26 Jory Pratt
2013-02-23 14:08 Jory Pratt
2012-12-10 22:27 Jory Pratt
2012-12-10 19:05 Ian Stakenvicius
2012-11-25 12:12 Jory Pratt
2012-10-28 0:41 Jory Pratt
2012-10-25 11:29 Jory Pratt
2012-10-21 18:32 Jory Pratt
2012-10-21 16:11 Jory Pratt
2012-10-04 11:27 Jory Pratt
2012-10-04 1:51 Jory Pratt
2012-09-27 22:37 Jory Pratt
2012-09-24 22:19 Jory Pratt
2012-08-06 3:28 Jory Pratt
2012-07-18 0:03 Jory Pratt
2012-07-17 22:45 Jory Pratt
2012-07-12 0:40 Jory Pratt
2012-07-02 13:38 Jory Pratt
2012-06-29 3:26 Jory Pratt
2012-06-15 3:25 Jory Pratt
2012-06-12 13:41 Jory Pratt
2012-06-12 5:25 Lars Wendler
2012-05-28 18:41 Jory Pratt
2012-05-27 15:46 Jory Pratt
2012-05-24 1:21 Jory Pratt
2012-05-21 14:37 Jory Pratt
2012-05-08 12:11 Jory Pratt
2012-04-21 2:51 Jory Pratt
2012-03-27 12:04 Jory Pratt
2012-03-24 23:47 Jory Pratt
2012-03-06 13:18 Jory Pratt
2012-02-11 2:13 Jory Pratt
2012-02-09 4:46 Jory Pratt
2011-09-29 2:23 Jory Pratt
2011-08-21 16:35 Jory Pratt
2011-08-20 21:30 Jory Pratt
2011-03-09 0:18 Jory Pratt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336392867.c4d5540ac678a833a43252e0490b375c8610a9a8.anarchy@gentoo \
--to=anarchy@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox