diff options
| author | Danny Rawlins <contact@romster.me> | 2021-10-26 22:22:39 +1100 |
|---|---|---|
| committer | Danny Rawlins <contact@romster.me> | 2021-10-26 22:22:39 +1100 |
| commit | a225975f5073d68e09d51d42e92311e229318aa0 (patch) | |
| tree | 5620cf01aa011b5c48a7f846b9e8d72b37b83594 /firefox | |
| parent | c6672b7fd9406f8d15d685d727154b16eecbcf0b (diff) | |
| download | contrib-a225975f5073d68e09d51d42e92311e229318aa0.tar.gz contrib-a225975f5073d68e09d51d42e92311e229318aa0.tar.xz | |
firefox: fix for rust version 1.56.0
Diffstat (limited to 'firefox')
| -rw-r--r-- | firefox/.signature | 5 | ||||
| -rw-r--r-- | firefox/Pkgfile | 9 | ||||
| -rw-r--r-- | firefox/rust-1.56.0.patch | 24 |
3 files changed, 34 insertions, 4 deletions
diff --git a/firefox/.signature b/firefox/.signature index ddc0ed9a9..f91828185 100644 --- a/firefox/.signature +++ b/firefox/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xbhgRFUCcR9/RgiHWUN/+2lnmXbHuR7UXZ0ue/ODlGMn6La3J7XWY2uYH/ra8uLYNfvEHaXOWdqACjeAbfcIAM= -SHA256 (Pkgfile) = cca1786e3cdf42b8ffc084cba5e5b96c9638c7de8bd089c48930a53464d38ed6 +RWSagIOpLGJF35WzIRTArnieb6ElXiEWOh3M1sbyEuaq6jrFq1l73OEpuTsiQbSmJAF6WGuG+sQjk9B5M8NrMsmKNoToaG20tQc= +SHA256 (Pkgfile) = 03eebfa21aa556e38e3fc7961b29d29bf2a925edaea54da69e4865c709a90fa5 SHA256 (.footprint) = 27ff13e160720bbfc07289b241337831458e954cc719d7544cc43c1b6ed370a3 SHA256 (firefox-93.0.source.tar.xz) = a78f080f5849bc284b84299f3540934a12e961a7ea368b592ae6576ea1f97102 SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91 SHA256 (0001-Use-remoting-name-for-GDK-application-names.patch) = 8b236bbf3ae5cb28d1dd742f543c0079fac06af5aa80bc2051defeba95f0ae21 +SHA256 (rust-1.56.0.patch) = 84c0ddb090ecaf327eb1bc9afa59309870c3f13a3d8b02774a0eb3cd1cb8b1ab diff --git a/firefox/Pkgfile b/firefox/Pkgfile index bb7344f69..b170abe3d 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -9,7 +9,8 @@ version=93.0 release=1 source=(https://archive.mozilla.org/pub/firefox/releases/$version/source/$name-$version.source.tar.xz firefox.desktop - 0001-Use-remoting-name-for-GDK-application-names.patch) + 0001-Use-remoting-name-for-GDK-application-names.patch + rust-1.56.0.patch) build() { cd $name-$version @@ -17,7 +18,11 @@ build() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 patch -p1 -i $SRC/0001-Use-remoting-name-for-GDK-application-names.patch - if [ $(/usr/bin/python -c "import sys; print sys.stdout.encoding") = 'UTF-8' ]; then + patch -p1 -i $SRC/rust-1.56.0.patch + sed -e 's/f2e2d0867734a62e1f468e5d3e15fbd01a15f8aafd5d65a8a3cb7ab95ffd61c4/41c2a5c5fb42225ce9c6a267653870fdb8af30f933b3b8534d57a15fb96ebb39/g' \ + -i third_party/rust/packed_simd/.cargo-checksum.json + + if [ "$(/usr/bin/python3 -c "import sys; print(sys.stdout.encoding)")" != 'utf-8' ]; then printf "\e[031mError: set an UTF-8 locale to compile this!\033[0m\n" exit 1 fi diff --git a/firefox/rust-1.56.0.patch b/firefox/rust-1.56.0.patch new file mode 100644 index 000000000..c14907248 --- /dev/null +++ b/firefox/rust-1.56.0.patch @@ -0,0 +1,24 @@ +From 45d5347a0d2187c046a546a477d2a53111cd7713 Mon Sep 17 00:00:00 2001 +From: Yuki Okushi <yuki.okushi@huawei.com> +Date: Sat, 4 Sep 2021 07:01:42 +0900 +Subject: [PATCH] Rename `const_generics` feature gate to `adt_const_params` + +edited to be universal between rust versions, crux. +--- + src/lib.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff -pruN firefox-93.0.orig/third_party/rust/packed_simd/src/lib.rs firefox-93.0/third_party/rust/packed_simd/src/lib.rs +--- firefox-93.0.orig/third_party/rust/packed_simd/src/lib.rs 2021-10-26 20:55:18.759640511 +1100 ++++ firefox-93.0/third_party/rust/packed_simd/src/lib.rs 2021-10-26 20:56:59.195873095 +1100 +@@ -199,8 +199,9 @@ + //! Numeric casts are not very "precise": sometimes lossy, sometimes value + //! preserving, etc. + ++#![cfg_attr(const_generics, feature(const_generics))] ++#![cfg_attr(not(const_generics), feature(adt_const_params))] + #![feature( +- const_generics, + repr_simd, + rustc_attrs, + platform_intrinsics, |