From 31a59cac0fe836b2438e2066acea6e26207cde53 Mon Sep 17 00:00:00 2001
From: yangxianzhao <yangxianzhao@uniontech.com>
Date: Mon, 23 Oct 2023 17:16:27 +0800
Subject: [PATCH] rebrand to anolis fix build error

---
 download                                      |  2 +
 ...refs.js => firefox-anolis-default-prefs.js |  4 +-
 firefox.spec                                  | 43 ++++++++++++++-----
 3 files changed, 37 insertions(+), 12 deletions(-)
 rename firefox-redhat-default-prefs.js => firefox-anolis-default-prefs.js (92%)

diff --git a/download b/download
index b29ff6b..c6b0ae3 100644
--- a/download
+++ b/download
@@ -4,3 +4,5 @@
 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 f130247..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",       "https://www.redhat.com");
-pref("startup.homepage_welcome_url",        "https://www.redhat.com");
+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 4c89165..c130caa 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,3 +1,5 @@
+%define anolis_release .0.1
+%global flatpak           1
 %global disable_toolsets  0
 
 # Produce debug (non-optimized) package build. Suitable for debugging only
@@ -65,7 +67,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
@@ -132,7 +134,7 @@ end}
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        115.3.1
-Release:        1%{?dist}
+Release:        1%{anolis_release}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 
@@ -147,7 +149,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
@@ -162,7 +164,7 @@ Source1:        firefox-langpacks-%{version}%{?pre_version}-20230929.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
@@ -184,6 +186,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 --
@@ -323,7 +326,7 @@ BuildRequires:  llvm-toolset-%{llvm_version}-llvm-devel
 %endif
 
 %if 0%{?use_rust_ts}
-BuildRequires:  rust-toolset-%{rust_version}
+#BuildRequires:  rust-toolset
 %endif
 
 # Bundled nss/nspr requirement
@@ -1208,7 +1211,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
@@ -1233,8 +1236,24 @@ which python3
 mkdir -p my_rust_vendor
 cd my_rust_vendor
 %{__tar} xf %{SOURCE2}
-mkdir -p .cargo
-cat > .cargo/config <<EOL
+cd ..
+mkdir rust-cbindgen
+cd rust-cbindgen
+%{__tar} xf %{SOURCE405}
+mkdir -p %{_buildrootdir}/cargo
+export CACHE_DIR=%{_buildrootdir}/cargo
+CARGO_HOME=$CACHE_DIR RUSTUP_HOME=$CACHE_DIR 
+%ifarch aarch64
+cp -r rust-cbindgen/rust-cbindgen-aarch64/* $CACHE_DIR
+%endif
+%ifarch x86_64
+cp -r rust-cbindgen/rust-cbindgen-x86_64/* $CACHE_DIR
+%endif
+export PATH=$CACHE_DIR/bin/:$PATH
+export LD_LIBRARY_PATH=$CACHE_DIR/lib:$LD_LIBRARY_PATH
+##rustup default stable
+rustc --version
+cat > %{_buildrootdir}/cargo/config <<EOL
 [source.crates-io]
 replace-with = "vendored-sources"
 
@@ -1246,8 +1265,8 @@ EOL
 #export RUSTFLAGS="-Cdebuginfo=0 -Clinker=/opt/rh/gcc-toolset-12/root/usr/bin/gcc"
 %endif
 
-env CARGO_HOME=.cargo cargo install cbindgen
-export PATH=`pwd`/.cargo/bin:$PATH
+#env CARGO_HOME=.cargo cargo install cbindgen
+#export PATH=`pwd`/.cargo/bin:$PATH
 cd -
 
 # end of Bundled cbindgen
@@ -1717,6 +1736,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Oct 23 2023 yangxianzhao <yangxianzhao@uniontech.com> - 115.3.1-1.0.1
+- rebrand: rebrand to anolis
+- fix build error
+
 * Fri Sep 29 2023 Eike Rathke <erack@redhat.com> - 115.3.1-1
 - Update to 115.3.1
 
-- 
Gitee