Update package version to 150.0.1p1
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
name: librewolf
|
||||
description: A custom version of Firefox, focused on privacy, security and freedom
|
||||
version: 150.0p1
|
||||
version: 150.0.1p1
|
||||
revision: 1
|
||||
url: https://librewolf.net/
|
||||
license: MPL2
|
||||
@@ -55,4 +55,4 @@ downloads:
|
||||
- url: https://codeberg.org/api/packages/librewolf/generic/librewolf-source/${BPM_PKG_VERSION//p/-}/librewolf-${BPM_PKG_VERSION//p/-}.source.tar.gz
|
||||
extract_to: ${BPM_SOURCE}
|
||||
extract_strip_components: 1
|
||||
checksum: e93d39180d74ea9e07d9a7cae7a441cc6e790f64e053f2b7e168cc490b043034
|
||||
checksum: d6470f5d93b531b9a20f750f2a2903ce20f5186e5bc4e87e28bbb6f4409fe4fa
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -20,7 +20,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D295287
|
||||
delete mode 100644 third_party/rust/encoding_rs/Cargo.toml.orig
|
||||
|
||||
diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in
|
||||
index 21d9d47c3b3e..ba7bd730d495 100644
|
||||
index f4959321f5f3..02bfffcf95b4 100644
|
||||
--- a/.cargo/config.toml.in
|
||||
+++ b/.cargo/config.toml.in
|
||||
@@ -70,6 +70,11 @@ git = "https://github.com/hsivonen/chardetng_c"
|
||||
@@ -36,7 +36,7 @@ index 21d9d47c3b3e..ba7bd730d495 100644
|
||||
git = "https://github.com/hsivonen/rust-harfbuzz"
|
||||
rev = "9d58a23a98772a197291d04af93f7041b7093d95"
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 8c97711dc449..8cf7d32bff8e 100644
|
||||
index 9d72c6d7cae0..47a3819637a0 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1912,11 +1912,11 @@ dependencies = [
|
||||
@@ -67,7 +67,7 @@ index 85edaada8988..4d9f6fbf021e 100644
|
||||
# objc 0.2.7 + fa7ca43b862861dd1cd000d7ad01e6e0266cda13
|
||||
objc = { git = "https://github.com/glandium/rust-objc", rev = "4de89f5aa9851ceca4d40e7ac1e2759410c04324" }
|
||||
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
|
||||
index 0ba55a6f723a..5b90663b2c4b 100644
|
||||
index fa002f1f0423..be1b01846189 100644
|
||||
--- a/supply-chain/audits.toml
|
||||
+++ b/supply-chain/audits.toml
|
||||
@@ -2380,6 +2380,12 @@ who = "Mike Hommey <[email protected]>"
|
||||
|
||||
@@ -1,12 +1,107 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 8c97711..cdd179b 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1917,6 +1917,7 @@ checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
|
||||
dependencies = [
|
||||
"any_all_workaround",
|
||||
"cfg-if",
|
||||
+ "rustversion",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
diff --git a/third_party/rust/encoding_rs/Cargo.toml b/third_party/rust/encoding_rs/Cargo.toml
|
||||
index 2adac35..0239315 100644
|
||||
--- a/third_party/rust/encoding_rs/Cargo.toml
|
||||
+++ b/third_party/rust/encoding_rs/Cargo.toml
|
||||
@@ -16,6 +16,7 @@ name = "encoding_rs"
|
||||
version = "0.8.35"
|
||||
authors = ["Henri Sivonen <[email protected]>"]
|
||||
build = false
|
||||
+autolib = false
|
||||
autobins = false
|
||||
autoexamples = false
|
||||
autotests = false
|
||||
@@ -39,33 +40,6 @@ categories = [
|
||||
license = "(Apache-2.0 OR MIT) AND BSD-3-Clause"
|
||||
repository = "https://github.com/hsivonen/encoding_rs"
|
||||
|
||||
-[profile.release]
|
||||
-lto = true
|
||||
-
|
||||
-[lib]
|
||||
-name = "encoding_rs"
|
||||
-path = "src/lib.rs"
|
||||
-
|
||||
-[dependencies.any_all_workaround]
|
||||
-version = "0.1.0"
|
||||
-optional = true
|
||||
-
|
||||
-[dependencies.cfg-if]
|
||||
-version = "1.0"
|
||||
-
|
||||
-[dependencies.serde]
|
||||
-version = "1.0"
|
||||
-optional = true
|
||||
-
|
||||
-[dev-dependencies.bincode]
|
||||
-version = "1.0"
|
||||
-
|
||||
-[dev-dependencies.serde_derive]
|
||||
-version = "1.0"
|
||||
-
|
||||
-[dev-dependencies.serde_json]
|
||||
-version = "1.0"
|
||||
-
|
||||
[features]
|
||||
alloc = []
|
||||
default = ["alloc"]
|
||||
@@ -84,4 +58,34 @@ fast-legacy-encode = [
|
||||
less-slow-big5-hanzi-encode = []
|
||||
less-slow-gb-hanzi-encode = []
|
||||
less-slow-kanji-encode = []
|
||||
-simd-accel = ["any_all_workaround"]
|
||||
+simd-accel = [
|
||||
+ "any_all_workaround",
|
||||
+ "rustversion",
|
||||
+]
|
||||
+
|
||||
+[lib]
|
||||
+name = "encoding_rs"
|
||||
+path = "src/lib.rs"
|
||||
+
|
||||
+[dependencies]
|
||||
+cfg-if = "1.0"
|
||||
+
|
||||
+[dependencies.any_all_workaround]
|
||||
+version = "0.1.0"
|
||||
+optional = true
|
||||
+
|
||||
+[dependencies.rustversion]
|
||||
+version = "1.0.19"
|
||||
+optional = true
|
||||
+
|
||||
+[dependencies.serde]
|
||||
+version = "1.0"
|
||||
+optional = true
|
||||
+
|
||||
+[dev-dependencies]
|
||||
+bincode = "1.0"
|
||||
+serde_derive = "1.0"
|
||||
+serde_json = "1.0"
|
||||
+
|
||||
+[profile.release]
|
||||
+lto = true
|
||||
diff --git a/third_party/rust/encoding_rs/src/x_user_defined.rs b/third_party/rust/encoding_rs/src/x_user_defined.rs
|
||||
index 7af7d5e..4018e99 100644
|
||||
index 7af7d5e..2d24c9c 100644
|
||||
--- a/third_party/rust/encoding_rs/src/x_user_defined.rs
|
||||
+++ b/third_party/rust/encoding_rs/src/x_user_defined.rs
|
||||
@@ -16,6 +16,7 @@ cfg_if! {
|
||||
@@ -16,6 +16,8 @@ cfg_if! {
|
||||
use simd_funcs::*;
|
||||
use core::simd::u16x8;
|
||||
use core::simd::cmp::SimdPartialOrd;
|
||||
+ use core::simd::Select;
|
||||
+ #[rustversion::since(1.95)]
|
||||
+ use core::simd::Select;
|
||||
|
||||
#[inline(always)]
|
||||
fn shift_upper(unpacked: u16x8) -> u16x8 {
|
||||
|
||||
@@ -6,15 +6,20 @@
|
||||
# This function is used for putting downloaded files to the correct location or applying patches
|
||||
prepare() {
|
||||
cd "$BPM_SOURCE"
|
||||
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=2033279
|
||||
sed -i 's/60cd124908737068ab21c7773b3df71d00e186cd605f15bad9977232830aabc0/9456ca46168ef86c98399a2536f577ef7be3cdde90c0c51392d8ac48519d3fae/g' third_party/rust/encoding_rs/.cargo-checksum.json
|
||||
sed -i 's/a066ad881d5a74386e666fc844f7fecbbd70021d0330c1b08a2d7a2a67437ccf/d7405d2bcf99cf9729075473c45f677630f4c1947c8ba9757db607f2025a7da2/g' third_party/rust/encoding_rs/.cargo-checksum.json
|
||||
patch -Rp1 -i ../rust-build.patch
|
||||
|
||||
# Fix build with rust 1.95
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=2033279
|
||||
patch -Np1 -i "$BPM_WORKDIR"/0002-Bug-2033279-Make-enable-rust-simd-work-with-Rust-1.9.patch
|
||||
|
||||
# Fix build with glibc 2.43
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1999625
|
||||
patch -Np1 -i "$BPM_WORKDIR"/0001-Patch-glsl-optimizer-to-build-with-glibc-2.43.patch
|
||||
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=2033279
|
||||
sed -i 's/b9432f9ed39742015f4bb4c3e75c89a2b9a9eef943dd0fd7cd889fddd1e6d39c/9456ca46168ef86c98399a2536f577ef7be3cdde90c0c51392d8ac48519d3fae/g' third_party/rust/encoding_rs/.cargo-checksum.json
|
||||
patch -Rp1 -i ../rust-build.patch
|
||||
patch -Np1 -i "$BPM_WORKDIR"/0002-Bug-2033279-Make-enable-rust-simd-work-with-Rust-1.9.patch
|
||||
|
||||
patch -i "$BPM_WORKDIR"/remove-duplicate-gkrust-features.diff "$BPM_SOURCE"/toolkit/library/rust/gkrust-features.mozbuild
|
||||
|
||||
# Generate mozconfig
|
||||
@@ -59,6 +64,9 @@ build() {
|
||||
export MOZBUILD_STATE_PATH="$BPM_SOURCE"/mozbuild
|
||||
export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none
|
||||
|
||||
# Reduce chance of builds failung during linking due to running out of memory
|
||||
export LDFLAGS+=" -Wl,--no-keep-memory"
|
||||
|
||||
./mach build
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user