Update package version to 151.0.2p1

This commit is contained in:
2026-06-01 14:42:34 +03:00
parent edcab6a159
commit 7547ed2eb2
6 changed files with 11 additions and 458 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
name: librewolf name: librewolf
description: A custom version of Firefox, focused on privacy, security and freedom description: A custom version of Firefox, focused on privacy, security and freedom
version: 150.0.3p1 version: 151.0.2p1
revision: 1 revision: 1
url: https://librewolf.net/ url: https://librewolf.net/
license: MPL2 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 - 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_to: ${BPM_SOURCE}
extract_strip_components: 1 extract_strip_components: 1
checksum: 1344a3245d6384ec3e486fcc37309372ce0495e7c56f84b74a8487f7936e799b checksum: ac1a3e1c489239b8ac78d0d594da3bb18c6ab1614114e898188a2214b062b7d5
@@ -52,7 +52,7 @@ Subject: [PATCH] Patch glsl-optimizer to build with glibc 2.43
delete mode 100644 third_party/rust/glslopt/glsl-optimizer/.gitignore delete mode 100644 third_party/rust/glslopt/glsl-optimizer/.gitignore
diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in diff --git a/.cargo/config.toml.in b/.cargo/config.toml.in
index 02bfffcf95b4..6c5e49abd7b8 100644 index be917029832d..0af8c7b9c51b 100644
--- a/.cargo/config.toml.in --- a/.cargo/config.toml.in
+++ b/.cargo/config.toml.in +++ b/.cargo/config.toml.in
@@ -5,6 +5,11 @@ @@ -5,6 +5,11 @@
@@ -68,10 +68,10 @@ index 02bfffcf95b4..6c5e49abd7b8 100644
git = "https://github.com/FirefoxGraphics/aa-stroke" git = "https://github.com/FirefoxGraphics/aa-stroke"
rev = "5776bdfc8ad664a1503db668fab397d818a5f98a" rev = "5776bdfc8ad664a1503db668fab397d818a5f98a"
diff --git a/Cargo.lock b/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock
index 47a3819637a0..d7d11c4d1310 100644 index 4c4d30dfbd38..0c71a15468cb 100644
--- a/Cargo.lock --- a/Cargo.lock
+++ b/Cargo.lock +++ b/Cargo.lock
@@ -2894,8 +2894,7 @@ dependencies = [ @@ -2897,8 +2897,7 @@ dependencies = [
[[package]] [[package]]
name = "glslopt" name = "glslopt"
version = "0.1.12" version = "0.1.12"
@@ -82,10 +82,10 @@ index 47a3819637a0..d7d11c4d1310 100644
"cc", "cc",
] ]
diff --git a/Cargo.toml b/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml
index 4d9f6fbf021e..cd9966a950e6 100644 index 2648c32ae57e..a6a6e93e9a73 100644
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@@ -282,6 +282,8 @@ harfbuzz = { git = "https://github.com/hsivonen/rust-harfbuzz", rev = "9d58a23a9 @@ -289,6 +289,8 @@ harfbuzz = { git = "https://github.com/hsivonen/rust-harfbuzz", rev = "9d58a23a9
harfbuzz-traits = { git = "https://github.com/hsivonen/rust-harfbuzz", rev = "9d58a23a98772a197291d04af93f7041b7093d95" } harfbuzz-traits = { git = "https://github.com/hsivonen/rust-harfbuzz", rev = "9d58a23a98772a197291d04af93f7041b7093d95" }
# Make --enable-rust-simd compatible with Rust 1.95 # Make --enable-rust-simd compatible with Rust 1.95
encoding_rs = { git = "https://github.com/hsivonen/encoding_rs", rev = "1236d1bc423e6ba35a06485f74a6304db2d703b5" } encoding_rs = { git = "https://github.com/hsivonen/encoding_rs", rev = "1236d1bc423e6ba35a06485f74a6304db2d703b5" }
@@ -95,10 +95,10 @@ index 4d9f6fbf021e..cd9966a950e6 100644
# objc 0.2.7 + fa7ca43b862861dd1cd000d7ad01e6e0266cda13 # objc 0.2.7 + fa7ca43b862861dd1cd000d7ad01e6e0266cda13
objc = { git = "https://github.com/glandium/rust-objc", rev = "4de89f5aa9851ceca4d40e7ac1e2759410c04324" } objc = { git = "https://github.com/glandium/rust-objc", rev = "4de89f5aa9851ceca4d40e7ac1e2759410c04324" }
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index be1b01846189..91432e0cca71 100644 index 44cb3a10d208..6814e05851f9 100644
--- a/supply-chain/audits.toml --- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml +++ b/supply-chain/audits.toml
@@ -2991,6 +2991,12 @@ criteria = "safe-to-deploy" @@ -2996,6 +2996,12 @@ criteria = "safe-to-deploy"
delta = "0.1.11 -> 0.1.12" delta = "0.1.11 -> 0.1.12"
notes = "Only a minor build tweak." notes = "Only a minor build tweak."
@@ -112,10 +112,10 @@ index be1b01846189..91432e0cca71 100644
who = "Jan-Erik Rediger <[email protected]>" who = "Jan-Erik Rediger <[email protected]>"
criteria = "safe-to-deploy" criteria = "safe-to-deploy"
diff --git a/supply-chain/config.toml b/supply-chain/config.toml diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index af46b149ab00..8a3a8458f38c 100644 index 15deefbec057..88848c730671 100644
--- a/supply-chain/config.toml --- a/supply-chain/config.toml
+++ b/supply-chain/config.toml +++ b/supply-chain/config.toml
@@ -68,6 +68,10 @@ notes = "Used for testing." @@ -60,6 +60,10 @@ notes = "Used for testing."
dependency-criteria = { tokio-reactor = [], tokio-threadpool = [] } dependency-criteria = { tokio-reactor = [], tokio-threadpool = [] }
notes = "The dependencies on tokio-reactor and tokio-threadpools are just a hack to pin the version used by audioipc-{client,server}. Suppress vetting on those for the same reasons behind the policy entries." notes = "The dependencies on tokio-reactor and tokio-threadpools are just a hack to pin the version used by audioipc-{client,server}. Suppress vetting on those for the same reasons behind the policy entries."
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
-107
View File
@@ -1,107 +0,0 @@
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..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,8 @@ cfg_if! {
use simd_funcs::*;
use core::simd::u16x8;
use core::simd::cmp::SimdPartialOrd;
+ #[rustversion::since(1.95)]
+ use core::simd::Select;
#[inline(always)]
fn shift_upper(unpacked: u16x8) -> u16x8 {
-9
View File
@@ -7,15 +7,6 @@
prepare() { prepare() {
cd "$BPM_SOURCE" 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 # Fix build with glibc 2.43
# https://bugzilla.mozilla.org/show_bug.cgi?id=1999625 # 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 patch -Np1 -i "$BPM_WORKDIR"/0001-Patch-glsl-optimizer-to-build-with-glibc-2.43.patch