diff --git a/003-libwebrtc-pipewire-camera-filter-out-devices-without-capabilities.patch b/003-libwebrtc-pipewire-camera-filter-out-devices-without-capabilities.patch index 1f40f4fc587273fea84d467b5b09555535642324..5c3c52402f92b173a9a828a01e35f1c3d2f8b43d 100644 --- a/003-libwebrtc-pipewire-camera-filter-out-devices-without-capabilities.patch +++ b/003-libwebrtc-pipewire-camera-filter-out-devices-without-capabilities.patch @@ -109,8 +109,8 @@ index 107ea3dfbd954..dbac09274bb31 100644 } -PipeWireNode::~PipeWireNode() { -- pw_proxy_destroy(proxy_); - spa_hook_remove(&node_listener_); +- pw_proxy_destroy(proxy_); -} - // static diff --git a/download b/download index c0581e51147f6db66c3e70e26f257af256c4e3f8..05af9ebe603fa2ac591c9d07a25ddab777bab6ba 100644 --- a/download +++ b/download @@ -1,7 +1,7 @@ fc25f988b87b5187d4e2f006efa699a3 cbindgen-vendor.tar.xz b3c1d2ea615cb0195f4f62b005773262 mochitest-python.tar.gz -41b4ac80021f2f640d9ee7599f6dabb8 firefox-128.9.0esr.b2.processed-source.tar.xz -fcfc7957f33934068b81ef12265a3e96 firefox-langpacks-128.9.0esr-20250331.tar.xz +ec91207cf793227ad67dbbca0386c7ee firefox-128.10.0esr.processed-source.tar.xz +6d27d0be9d6201266fc07bf7d2a1230f firefox-langpacks-128.10.0esr-20250422.tar.xz 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm ab085bce989de91681f48fdd05be4c0f nss-3.101.0-7.el8_2.src.rpm dbf6357877e3e1042de1a95cdfb61507 nss-3.101.0-7.el9_2.src.rpm diff --git a/firefox-anolis-default-prefs.js b/firefox-anolis-default-prefs.js index 5ae1109ef54e11d1b648d1548b1ac923e16fca92..1d768bbce726b326326648604855d6d71cfc332a 100644 --- a/firefox-anolis-default-prefs.js +++ b/firefox-anolis-default-prefs.js @@ -15,7 +15,7 @@ pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); pref("startup.homepage_override_url", "https://openanolis.cn"); -pref("startup.homepage_welcome_url", "https://openanolis.cn"); +pref("strtup.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 6f30364a00ac7f56407f6ce1c2e331d62582786d..78c4b74d3eb559c3d7df8b95d687790b2a2f5621 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,4 +1,9 @@ %define anolis_release .0.2 +# 排除 libstdc++ 相关依赖 +%global __requires_exclude ^libstdc\\+\\+ +AutoReq: no +AutoProv: no + %define homepage %(grep '^HOME_URL\s*=' /etc/os-release | sed 's/^HOME_URL\s*=//;s/^\s*"//;s/"\s*$//') %global disable_toolsets 0 @@ -13,11 +18,6 @@ %global run_firefox_tests 0 %endif -# 排除 libstdc++ 相关依赖 -%global __requires_exclude ^libstdc\\+\\+ -AutoReq: no -AutoProv: no - # wasi_sdk is for sandboxing third party c/c++ libs by using rlbox, exclude s390x on the f39. %global with_wasi_sdk 0 @@ -46,7 +46,7 @@ function dist_to_rhel_minor(str, start) end match = string.match(str, ".el9") if match then - return 6 + return 7 end match = string.match(str, ".el10_%d+") if match then @@ -54,7 +54,7 @@ function dist_to_rhel_minor(str, start) end match = string.match(str, ".el10") if match then - return 0 + return 1 end return -1 end} @@ -162,7 +162,7 @@ end} # If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g. # firefox-102.8.0esr.b2.processed-source.tar.xz # When unset use processed source file name as is. -%global buildnum .b2 +#%%global buildnum .b2 %bcond_without langpacks @@ -172,8 +172,8 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 128.9.0 -Release: 2%{anolis_release}%{?dist} +Version: 128.10.0 +Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -203,7 +203,7 @@ ExcludeArch: aarch64 s390 ppc # Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%%{version}%%{?pre_version}/source/firefox-%%{version}%%{?pre_version}.source.tar.xz Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20250331.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20250422.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1989,7 +1989,6 @@ if [ "$1" -eq 0 ] ; then rm -f /usr/lib64/libstdc++.so.6.0.29 ldconfig fi - %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -2047,7 +2046,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/fonts/TwemojiMozilla.ttf %{mozappdir}/glxtest %{mozappdir}/vaapitest -%ifarch aarch64 +%ifarch aarch64 riscv64 %{mozappdir}/v4l2test %endif @@ -2069,6 +2068,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Oct 20 2025 zhuhongbo - 128.10.0-1.0.2 +- Update to 128.10.0-1 + * Wed Sep 10 2025 zhuhongbo - 128.9.0-2.0.2 - Update to firefox-128.9.0-2