summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/firefox-esr/Makefile3
-rw-r--r--www/firefox-esr/distinfo6
-rw-r--r--www/firefox-esr/files/patch-rust-1.78.0-arm64
3 files changed, 4 insertions, 69 deletions
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 64a23843adfb..4857145dd030 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,6 +1,5 @@
PORTNAME= firefox
-DISTVERSION= 115.11.0
-PORTREVISION= 1
+DISTVERSION= 115.12.0
PORTEPOCH= 1
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 08fddf921341..b5148d934455 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1715020977
-SHA256 (firefox-115.11.0esr.source.tar.xz) = 16be46f16a356a2b8bd3541805a24c8a2acf6f077cf8a65859689685c26025e0
-SIZE (firefox-115.11.0esr.source.tar.xz) = 506015444
+TIMESTAMP = 1717440071
+SHA256 (firefox-115.12.0esr.source.tar.xz) = b59e1625a0bb2f0565a737394f2bf8a7ce3171314b0d871bde533a101847a8ef
+SIZE (firefox-115.12.0esr.source.tar.xz) = 505219784
diff --git a/www/firefox-esr/files/patch-rust-1.78.0-arm b/www/firefox-esr/files/patch-rust-1.78.0-arm
deleted file mode 100644
index 7db8038cfaeb..000000000000
--- a/www/firefox-esr/files/patch-rust-1.78.0-arm
+++ /dev/null
@@ -1,64 +0,0 @@
-Relevant bug report: https://bugzilla.mozilla.org/show_bug.cgi?id=1882291
-
-
-diff --git a/Cargo.lock b/Cargo.lock
---- Cargo.lock
-+++ Cargo.lock
-@@ -4274,10 +4274,11 @@
- [[package]]
- name = "qcms"
- version = "0.2.0"
- dependencies = [
- "libc",
-+ "version_check",
- ]
-
- [[package]]
- name = "qlog"
- version = "0.4.0"
-diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml
---- gfx/qcms/Cargo.toml
-+++ gfx/qcms/Cargo.toml
-@@ -18,5 +18,8 @@
- iccv4-enabled = []
- cmyk = []
-
- [dependencies]
- libc = {version = "0.2", optional = true }
-+
-+[build-dependencies]
-+version_check = "0.9"
-diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs
-new file mode 100644
---- /dev/null
-+++ gfx/qcms/build.rs
-@@ -0,0 +1,7 @@
-+extern crate version_check as rustc;
-+
-+fn main() {
-+ if rustc::is_min_version("1.78.0").unwrap_or(false) {
-+ println!("cargo:rustc-cfg=stdsimd_split");
-+ }
-+}
-diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs
---- gfx/qcms/src/lib.rs
-+++ gfx/qcms/src/lib.rs
-@@ -5,13 +5,15 @@
- #![allow(non_camel_case_types)]
- #![allow(non_snake_case)]
- #![allow(non_upper_case_globals)]
- // These are needed for the neon SIMD code and can be removed once the MSRV supports the
- // instrinsics we use
--#![cfg_attr(feature = "neon", feature(stdsimd))]
-+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))]
-+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))]
-+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))]
- #![cfg_attr(
-- feature = "neon",
-+ all(target_arch = "arm", feature = "neon"),
- feature(arm_target_feature, raw_ref_op)
-
- )]
-
- /// These values match the Rendering Intent values from the ICC spec
-