[arch-commits] Commit in seamonkey/trunk (PKGBUILD seamonkey-rust-1.52.patch)

[Antonio Rojas]

    Date: Sunday, July 4, 2021 @ 17:57:36
  Author: arojas
Revision: 972166

Update to 2.53.8

Modified:
  seamonkey/trunk/PKGBUILD
Deleted:
  seamonkey/trunk/seamonkey-rust-1.52.patch

---------------------------+
 PKGBUILD                  |   12 +++-------
 seamonkey-rust-1.52.patch |   51 --------------------------------------------
 2 files changed, 4 insertions(+), 59 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-04 17:30:56 UTC (rev 972165)
+++ PKGBUILD	2021-07-04 17:57:36 UTC (rev 972166)
@@ -1,7 +1,7 @@
 # Maintainer: Kyle Keen <keenerd at gmail.com>
 
 pkgname=seamonkey
-pkgver=2.53.7.1
+pkgver=2.53.8
 pkgrel=1
 pkgdesc="SeaMonkey internet suite"
 arch=('x86_64')
@@ -16,10 +16,8 @@
 	    'pulseaudio: Audio support')
 url="https://www.seamonkey-project.org/"
 source=("https://archive.mozilla.org/pub/seamonkey/releases/$pkgver/source/seamonkey-$pkgver.source.tar.xz"
-        "seamonkey-rust-1.52.patch"
         "mozconfig")
-sha256sums=('432206fe787ffb560e811d32103658d676dccb012fc7092d2071bb59729603ea'
-            '6c4db819efacef515fa6459788e69f0def98f9766e37579ff08735caaab869cc'
+sha256sums=('5c8f2a82cc9895235fd84eca5d1bb702d8e0428ae04a97a2f31af86d68cdba15'
             '05bbf05f6a2f060ba3b69a420d57e95766880869a3e416cb05f60894bce1213b')
 install="$pkgname.install"
 
@@ -39,8 +37,6 @@
   cd "$pkgname-$pkgver"
   cp ../mozconfig .mozconfig
 
-  patch -p1 < ../seamonkey-rust-1.52.patch # Fix build with rust 1.52 (gentoo)
-
   echo -n "$_google_api_key" > google-api-key
   echo -n "$_mozilla_api_key" > mozilla-api-key
 
@@ -54,13 +50,13 @@
 build() {
   cd "$pkgname-$pkgver"
 
-  make -f client.mk build
+  ./mach build
 }
 
 package() {
   cd "$pkgname-$pkgver"
 
-  make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
+  DESTDIR="$pkgdir" INSTALL_SDK= ./mach install
 
   rm -rf "$pkgdir"/usr/lib/seamonkey/{dictionaries,hyphenation}
   ln -s /usr/share/hunspell "$pkgdir/usr/lib/seamonkey/dictionaries"

Deleted: seamonkey-rust-1.52.patch
===================================================================
--- seamonkey-rust-1.52.patch	2021-07-04 17:30:56 UTC (rev 972165)
+++ seamonkey-rust-1.52.patch	2021-07-04 17:57:36 UTC (rev 972166)
@@ -1,51 +0,0 @@
-http://www.wg9s.com/comm-253/patches/seamonkey-253-patches/mozilla-release/patches/1670538-87a1.patch
-
---- 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");
-+     }
-+ }