diff options
Diffstat (limited to 'www-client/seamonkey')
| -rw-r--r-- | www-client/seamonkey/Manifest | 3 | ||||
| -rw-r--r-- | www-client/seamonkey/files/seamonkey-2.53.7.1-rust-1.52.patch | 52 | ||||
| -rw-r--r-- | www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild | 8 |
3 files changed, 57 insertions, 6 deletions
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest index 95f507bbd537..bbc911a5774f 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -1,10 +1,11 @@ AUX all-gentoo-1.js 1008 BLAKE2B 50418db37f55b9b9e53049abb95af79a5ee5137df9aab3ef6d1791e51a0c2f35d78b390982c5c20f4a57acebfaa013139276d0343cd4733a925510c8a5567c69 SHA512 5d1c9331db3c988f79be7756b57254bb3d2cb56cf10c7e79878d9968f882713cdcca0013d3507c4d69fcc7e99164a27b05ffbbb5ce78ee86b91ecce366a997c4 AUX seamonkey-2.53.7-ownertab.patch 10144 BLAKE2B fd30a83ede6f2d284ac6f308bc1dbc298961e468cc7e353cec95f13b0db8b5722494075dfd73b261348c9affb187b203a7598e7f62a062fbdcf87a62561f723b SHA512 227882f698918d160e01df47516af90bbfa13b206d5ddf6184b5b44ecc2b940e7424955001a4759a24529cd63150e5ef922c4e605d577b0201be6fce81c7c9ea AUX seamonkey-2.53.7.1-cpu_hog_fix.patch 2741 BLAKE2B be6bd492a84a61635334271d9ca53e031184e4780115a889d5e73cf74cec6209546210ec36cec3f929d37dce16d855d8c2563de15736a18717b4125027d34f97 SHA512 f1bb8db6eb5b3b5dd2aad4a9e5bb7592923f95f04639e84a0eac643b573b399675a6a8126152a0a07620443314f4563288c89ff0cc4cdc592fc680bf2fe6e7a2 +AUX seamonkey-2.53.7.1-rust-1.52.patch 2041 BLAKE2B 3cde5c871ced550b0150bc9a241f4be90749132cbddfe2b19c942e4ebba52144a28fe7c37acb74a821b436d99124633fd3adb2301099ef7c6e13676c55baa74f SHA512 28e872c492284704b1ab7bed9e0c35e53436f796e218319a45ab27ee8a7983d34c877404cb2804595843637276c75508f8cfb8f998bc0591ab079c65d3e94435 AUX seamonkey.desktop 307 BLAKE2B 81aaa9a69dc60ae0872ebdfe796d3a6afbd4bd15c1c83c14abc06579c15bed2e48114e3fb374bab0ba7d9d4de28109b215601a2d6bd56af3aa9e82a4d0baaa91 SHA512 081d8ec12e9e2035fc8020238803ab9df98dac4350ce90a29e9e65a38efa13bb14cba0fbc2e68a2a857c5046142c68ecc8ab4535da4f284c0e04a3879afc429f DIST seamonkey-2.53.3-system_libvpx-1.8.patch.xz 3128 BLAKE2B f73802d2715a11964a4b4d34b582a2999ab42cff9ed005c5ca8c002ae745a973fbb682c3e568f6727a7fe93dc2d7a5ba3367adc4e1d256b8ab0cf8d940fceb8a SHA512 80b87c260445af181d1a0d39de9f95ac7c93f76e12328c1799e8607f50ca9e2a20bc4f15de3f32efbbabb444fd5352612b2629fee61875fa0acd6d050df338a2 DIST seamonkey-2.53.6_beta1-patches-01.tar.xz 44160 BLAKE2B f6a959a983e726cd919ab5004b27cd496a78cd58759168d6dd64e155059c7b52f269bc42143ddb69a1e8880c72779257216d942a1abc58800491fde9eaaea061 SHA512 710e668209f76f2ca4112923c61219e435123791dfcfcb202af1f7975436d17f13ab025722e9725f219e9de9d024091514d23c71a851d68f750c11ea8d56c2b9 DIST seamonkey-2.53.7.1.source-l10n.tar.xz 13540652 BLAKE2B a42471ee8d2c4c57158291a9770aa6759a620e4b9a38a1bedcf17495332924839d65f1a12dce3c7452137fd6d176c576ec0da639f20be29621b10406c0e9bd4f SHA512 d4bde45e0dfdbd1eb316ef3f3d2e611a1a3314a1144ad7075f96ad35c961bc07fd82bbfd7959aa9bee0034cbf081427670d7da3eb3b3aac85b5db7aab92b32a5 DIST seamonkey-2.53.7.1.source.tar.xz 283452108 BLAKE2B 4f0a73c5d57c708e4b5d5af6ddee1c9515b6bf401b0181da17c03cdeee1afb9d120c0157cdf2a07e8fa6495462e8bbb4b85e3e6646dbbead123934c565732926 SHA512 21f52b2668b8cb31670a80f3fbcd04d714527545ddd36fa5782999be398428cfeac989da4e3e7e049202249d43c71228ebc8640dd0b594150c8cff0b587caf7e -EBUILD seamonkey-2.53.7.1-r1.ebuild 17016 BLAKE2B 510209a67ec6491980882db3d4db818836d16db5a12274360f3127c33be75a2926bfab00b4ea82dbaf3b1bfcdca6f1aa1dc0e16dc22ff7417226b0778d53be6d SHA512 8229072b97e4986b1d3c2de921e6d6d88e061132f2f2f799d1ab8652cacc76a3f05f1e8625adaea49e63e23f948ce9da299538a9530657b4b059fb94f86b84ab +EBUILD seamonkey-2.53.7.1-r1.ebuild 16956 BLAKE2B 1162ef2bb67f7dc2af1d80415836ca9e6475cf137689ace003061ea1173552ea43e38e35e07e2ad5771a99f623272e800b290f666aed36e55df3e16492f3818c SHA512 ef08e740bcc8f9357494cbeb9ead684229f8016960de459f63b728e0c67aae99436f0f02b80e3675a970d8f117b2573b777d9b3a08a3ec7ded7224e6d8a7b8cc MISC metadata.xml 1931 BLAKE2B 3cb5bb9f57b5b669b2c9c0d90616bd04928483f51bf0c0909e63836e069f6a87cfd0a2f37b8753abe8976a11219c7daa577ac0d9ee6f2335eec7c375614333ee SHA512 9ee6b67335f7a66a8ad1d211f257042fe9b741432691502be8b39d71888a1f783310fb1049757cb5059c530aa3b6e0c1d6b94f86feaf74fd096168c21611f524 diff --git a/www-client/seamonkey/files/seamonkey-2.53.7.1-rust-1.52.patch b/www-client/seamonkey/files/seamonkey-2.53.7.1-rust-1.52.patch new file mode 100644 index 000000000000..47c3995e41c5 --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-2.53.7.1-rust-1.52.patch @@ -0,0 +1,52 @@ +http://www.wg9s.com/comm-253/patches/seamonkey-253-patches/mozilla-release/patches/1670538-87a1.patch +https://bugs.gentoo.org/789981 + +--- seamonkey-2.53.7.1/config/rules.mk ++++ seamonkey-2.53.7.1/config/rules.mk +@@ -861,16 +861,27 @@ + # Versions of rust >= 1.45 need -Cembed-bitcode=yes for all crates when + # using -Clto. + ifeq (,$(filter 1.37.% 1.38.% 1.39.% 1.40.% 1.41.% 1.42.% 1.43.% 1.44.%,$(RUSTC_VERSION))) + RUSTFLAGS += -Cembed-bitcode=yes + endif + endif + endif + ++ifndef RUSTC_BOOTSTRAP ++ifeq (,$(filter 1.47.% 1.48.% 1.49.%,$(RUSTC_VERSION))) ++# RUSTC_BOOTSTRAP := gkrust_shared,qcms for later ++RUSTC_BOOTSTRAP := gkrust_shared ++ifdef MOZ_RUST_SIMD ++RUSTC_BOOTSTRAP := $(RUSTC_BOOTSTRAP),encoding_rs,packed_simd ++endif ++export RUSTC_BOOTSTRAP ++endif ++endif ++ + rustflags_override = RUSTFLAGS='$(MOZ_RUST_DEFAULT_FLAGS) $(RUSTFLAGS)' + + ifdef MOZ_MSVCBITS + # If we are building a MozillaBuild shell, we want to clear out the + # vcvars.bat environment variables for cargo builds. This is because + # a 32-bit MozillaBuild shell on a 64-bit machine will try to use + # the 32-bit compiler/linker for everything, while cargo/rustc wants + # to use the 64-bit linker for build.rs scripts. This conflict results +--- seamonkey-2.53.7.1/toolkit/library/rust/shared/build.rs.1670538.later ++++ seamonkey-2.53.7.1/toolkit/library/rust/shared/build.rs.1670538.later +@@ -0,0 +1,16 @@ ++--- build.rs +++++ build.rs ++@@ -17,12 +17,12 @@ fn main() { ++ } else if std::env::var("MOZ_AUTOMATION").is_ok() { ++ panic!("Builds on automation must use a version of rust for which we know how to hook OOM: want < {}, have {}", ++ max_oom_hook_version, ver); ++ } ++ ++ // This is a rather awful thing to do, but we're only doing it on ++ // versions of rustc that are not going to change the unstable APIs ++ // we use from under us, all being already released or beta. ++- if bootstrap { +++ if bootstrap && ver < Version::parse("1.50.0").unwrap() { ++ println!("cargo:rustc-env=RUSTC_BOOTSTRAP=1"); ++ } ++ } diff --git a/www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild b/www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild index ce8fefb7646d..7ff2f9c71b48 100644 --- a/www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild +++ b/www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild @@ -49,7 +49,7 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1" SLOT="0" SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} ) IUSE="+chatzilla cpu_flags_arm_neon +crypt dbus debug +gmp-autoupdate +ipc jack -lto minimal pulseaudio +roaming selinux startup-notification test wifi" +lto pulseaudio +roaming selinux startup-notification test wifi" IUSE+=" ${SYSTEM_IUSE[@]}" KEYWORDS="amd64 ~ppc64 x86" @@ -195,6 +195,8 @@ src_prepare() { # https://github.com/JustOff/github-wc-polyfill/issues/10 eapply "${FILESDIR}/${PN}-2.53.7.1-cpu_hog_fix.patch" + eapply "${FILESDIR}/${PN}-2.53.7.1-rust-1.52.patch" #789981 + # Shell scripts sometimes contain DOS line endings; bug 391889 grep -rlZ --include="*.sh" $'\r$' . | while read -r -d $'\0' file ; do @@ -498,10 +500,6 @@ src_install() { # Required in order to use plugins and even run seamonkey on hardened. pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container} - if use minimal ; then - rm -r "${ED}"/usr/include "${ED}/${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} || die - fi - if use chatzilla ; then emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}' |