From 6549dd02e2a1a621b1d0d92286eef5ccee33c505 Mon Sep 17 00:00:00 2001 From: yangxianzhao Date: Thu, 23 Nov 2023 16:15:48 +0800 Subject: [PATCH] rebrand to anolis fix build error --- download | 1 + ...refs.js => firefox-anolis-default-prefs.js | 4 +- firefox.spec | 45 ++++++++++++++----- 3 files changed, 38 insertions(+), 12 deletions(-) rename firefox-redhat-default-prefs.js => firefox-anolis-default-prefs.js (92%) diff --git a/download b/download index 166fffd..6d88852 100644 --- a/download +++ b/download @@ -5,3 +5,4 @@ b3c1d2ea615cb0195f4f62b005773262 mochitest-python.tar.gz 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm 3fdd30cefe44a98c424cb3aeca73f2b3 nss-3.90.0-3.el8_1.src.rpm 5c2f6d790957733c5f0d06f8caea3b0d nss-3.90.0-3.el9_0.src.rpm +6611e41665de11dd80b2ff5f1f40ee03 rust-cbindgen.tar.gz diff --git a/firefox-redhat-default-prefs.js b/firefox-anolis-default-prefs.js similarity index 92% rename from firefox-redhat-default-prefs.js rename to firefox-anolis-default-prefs.js index cdb98dd..e24ebbd 100644 --- a/firefox-redhat-default-prefs.js +++ b/firefox-anolis-default-prefs.js @@ -14,8 +14,8 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", "%HOMEPAGE%"); -pref("startup.homepage_welcome_url", "%HOMEPAGE%"); +pref("startup.homepage_override_url", "https://openanolis.cn"); +pref("startup.homepage_welcome_url", "https://openanolis.cn"); pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html"); pref("media.gmp-gmpopenh264.autoupdate",true); pref("media.gmp-gmpopenh264.enabled",false); diff --git a/firefox.spec b/firefox.spec index 6fd54ac..fab5eee 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,3 +1,6 @@ +%define anolis_release .0.1 +%global flatpak 1 + %define homepage %(grep '^HOME_URL\s*=' /etc/os-release | sed 's/^HOME_URL\s*=//;s/^\s*"//;s/"\s*$//') %global disable_toolsets 0 @@ -66,7 +69,7 @@ end} %global nspr_version_max 4.36 %global nss_version 3.90 %global nss_version_max 3.91 -%global rust_version 1.66 +#%global rust_version 1.66 %global system_libvpx 0 # Toolsets setup @@ -133,7 +136,7 @@ end} Summary: Mozilla Firefox Web browser Name: firefox Version: 115.4.0 -Release: 1%{?dist} +Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -148,7 +151,7 @@ ExcludeArch: %{ix86} %endif %endif %if 0%{?rhel} == 7 -ExcludeArch: aarch64 s390 ppc +ExcludeArch: s390 ppc %endif # We can't use the official tarball as it contains some test files that use @@ -163,7 +166,7 @@ Source1: firefox-langpacks-%{version}%{?pre_version}-20231017.tar.xz Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball Source10: firefox-mozconfig -Source12: firefox-redhat-default-prefs.js +Source12: firefox-anolis-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source23: firefox.1 @@ -185,6 +188,7 @@ Source401: nss-setup-flags-env.inc Source402: nspr-4.35.0-1.el8_1.src.rpm Source403: nss-3.90.0-3.el8_1.src.rpm Source404: nss-3.90.0-3.el9_0.src.rpm +Source405: rust-cbindgen.tar.gz # ---- RHEL specific patches --- # -- Downstream only -- @@ -327,7 +331,7 @@ BuildRequires: llvm-toolset-%{llvm_version}-llvm-devel %endif %if 0%{?use_rust_ts} -BuildRequires: rust-toolset-%{rust_version} +#BuildRequires: rust-toolset-%{rust_version} %endif # Bundled nss/nspr requirement @@ -1217,7 +1221,7 @@ source scl_source enable gcc-toolset-12 source scl_source enable devtoolset-%{dts_version} %endif %if 0%{?use_rust_ts} -source scl_source enable rust-toolset-%{rust_version} +source scl_source enable rust-toolset %endif %if 0%{?use_nodejs_scl} source scl_source enable rh-nodejs10 @@ -1242,8 +1246,25 @@ which python3 mkdir -p my_rust_vendor cd my_rust_vendor %{__tar} xf %{SOURCE2} -mkdir -p .cargo -cat > .cargo/config < %{_buildrootdir}/cargo/config </dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Nov 23 2023 yangxianzhao - 115.4.0-1.0.1 +- rebrand to anolis +- fix build error + * Tue Oct 17 2023 Eike Rathke - 115.4.0-1 - Update to 115.4.0 build1 - Add fix for CVE-2023-44488 -- Gitee