commit: 17dd7c783d8ffb22b117436bc4f281018b7b9167
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 4 22:37:55 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 22:37:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=17dd7c78
seamonkey: ebuild improvements.
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
www-client/seamonkey/Manifest | 1 +
www-client/seamonkey/seamonkey-2.40_pre4.ebuild | 24 ++++++++++++++++++++----
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index f68fa3a..5c452b1 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,6 +1,7 @@
DIST enigmail-1.8.2.tar.gz 1604159 SHA256
1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512
51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11
WHIRLPOOL
e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
DIST firefox-38.0-patches-0.3.tar.xz 4796 SHA256
bfbef81748f76f5f80c3ce6e6b810b65f6266f71da02722b1e8c9fad865b02bd SHA512
a974e33759246153db7d83488f1326275efd12c44a6c8c539cbc35709b4dbd27e848bda32f302ac2baa5d8729ba20579ebc7f643419757f542972ca1a264d520
WHIRLPOOL
3549239db380c02a1575ff407ea684a14827f2250d991b5eb6c8a341ceebaca57cd2cc422e160f00dfab933385d677574cd84947da07bd282c68bb84c40fa42b
DIST firefox-42.0-patches-0.3.tar.xz 13360 SHA256
8f1b592454695a27cd8ab6a234705d73363af0a5ecc5e64c30072def05fd5fc8 SHA512
4aa1ab7b8482b2d6af35cc293443678eb3c33a6eb2577fc0553ec94b3c3a3cbd7c322d50c004ac646296491fe1f67f5d199635750b0c50cc4f0742af704a9cac
WHIRLPOOL
e755b9fd4da821e8d0490e138531dcc55e9c9dd6ebbbf33771fffda9fe932df79c1d26dc8ad6b6dc9e8a444ee47659f7ef90846dc076299793db4726be06b94e
+DIST mozilla-graphite2-1.3.5-upgrade_patches.tar.xz 92916 SHA256
6314600c4d19112a51fba1f406eaef34b50df78405aa7cb0080550322d9b9ff9 SHA512
7fa37fe27587b80aaf4a2625abf7a28553286ecfa837b4c7c7d5a217abf8cf01a2446471f7c320d484325c2f7461161b00df75ff9a5d9efc70140e9723f5ac2f
WHIRLPOOL
749ba5919850945f0fe36dfac912206cd38c50ae244703d07e37ea8a99a6b0c4300d0dd443db6c7a7fea22792ac7ccc8f839d598260e3e9f044e03431513f5c8
DIST seamonkey-2.33-patches-01.tar.xz 944 SHA256
1612d94dddbd37fa4ce8307c1ba565c8439d082609b63c12b4971e361895566c SHA512
0132e7d06a1ea5d6c059f23e5b8a20016a1e911e8aa40ae15eaefcd141030b4d245297f1e13e508827d91bab5988db4775c8425e737654afba2ede9c2dee8392
WHIRLPOOL
4520c4eaa7e6a25f5c32e9cd1d46472e181fbd769a1c5a59c913834cec5556100eac01423b4abf4a47543d0fbae4bf83b0f4a4d6cec7a058587e2705043bf507
DIST seamonkey-2.35-be.xpi 844271 SHA256
c1043f743a353dfb46db8f524249c808183e89f4f0f7a6181f9d5304d545f694 SHA512
2683a9e5858680a37b152c77fc15964d9b342e2d2a0fc409968b6cf35758f2bf30b3339dcd5c860ef95c56ed85c224383f95efc3d14999cd0a3e4a396c7c4644
WHIRLPOOL
f3f69369b0e225cdbb8fc1ac35e4e2295ed1778df7cabd3c9f4f566b758ee6f7dc2f922e422b5b5175bc2ff2ecc15769e535810a90435d15f57f7b22217eb1bf
DIST seamonkey-2.35-ca.xpi 835414 SHA256
6b6bc56a6f780f18a8736a554fcec9b042ff8c3a4ecbef9d192d3ad6a67ed150 SHA512
7dd90e4d3124749971c66c5aa49c4a7ba2fa3813df49526d8f42083b0b6b712362005d3e7332a4d74b053360d56beb22f922e6917471f42e81386b7cc5d9b6d0
WHIRLPOOL
8aa4bc9e1d662c3488fe27b490b4bc42536931a82340b5b133b9886efd10836b64da3c7f253cfd83e561f0d9b2ed03cae922a836c9bb0f927a4c28dabd1de64f
diff --git a/www-client/seamonkey/seamonkey-2.40_pre4.ebuild
b/www-client/seamonkey/seamonkey-2.40_pre4.ebuild
index 1a66157..33e6745 100644
--- a/www-client/seamonkey/seamonkey-2.40_pre4.ebuild
+++ b/www-client/seamonkey/seamonkey-2.40_pre4.ebuild
@@ -28,7 +28,7 @@ fi
MOZCONFIG_OPTIONAL_WIFI=1
MOZCONFIG_OPTIONAL_JIT="enabled"
-inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.41
multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.42
multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
PATCHFF="firefox-42.0-patches-0.3"
PATCH="${PN}-2.33-patches-01"
@@ -37,7 +37,7 @@ EMVER="1.8.2"
DESCRIPTION="Seamonkey Web Browser"
HOMEPAGE="http://www.seamonkey-project.org";
-[[ ${PV} != *_pre* ]] && \
+#[[ ${PV} != *_pre* ]] && \
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
SLOT="0"
@@ -49,12 +49,13 @@ SRC_URI="${SRC_URI}
https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+
https://dev.gentoo.org/~polynomial-c/mozilla/mozilla-graphite2-1.3.5-upgrade_patches.tar.xz
crypt? (
https://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
ASM_DEPEND=">=dev-lang/yasm-1.1"
-RDEPEND=">=dev-libs/nss-3.19.2
- >=dev-libs/nspr-4.10.8
+RDEPEND=">=dev-libs/nss-3.20.1
+ >=dev-libs/nspr-4.10.10
crypt? ( || (
( >=app-crypt/gnupg-2.0
|| (
@@ -118,6 +119,18 @@ src_prepare() {
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}/firefox"
+
+ # graphite2 fixes (bug #574968)
+ EPATCH_EXCLUDE="0001-mozilla-graphite2-1.3.0.patch
+ 0002-mozilla-graphite2-1.3.2.patch
+ 0003-mozilla-graphite2-gr_nobidi-flag.patch
+ 0004-mozilla-graphite2-1.3.3.patch
+ 0005-mozilla-graphite2-1.3.4.patch
+ 0006-mozilla-graphite2-post-1.3.4-bugfixes.patch
+ 0007-mozilla-graphite2-always_call_ReleaseGrFace.patch"
\
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/mozilla-graphite2"
popd &>/dev/null || die
# Shell scripts sometimes contain DOS line endings; bug 391889
@@ -178,6 +191,9 @@ src_configure() {
mozconfig_init
mozconfig_config
+ # We want rpath support to prevent unneeded hacks on different libc
variants
+ append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
+
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
