diff options
| -rw-r--r-- | build-python.patch | 12 | ||||
| -rw-r--r-- | firefox-mozconfig | 1 | ||||
| -rw-r--r-- | firefox.spec | 6 |
3 files changed, 17 insertions, 2 deletions
diff --git a/build-python.patch b/build-python.patch new file mode 100644 index 0000000..eae8e18 --- /dev/null +++ b/build-python.patch @@ -0,0 +1,12 @@ +diff -up firefox-95.0/build/mach_virtualenv_packages.txt.pytpatch firefox-95.0/build/mach_virtualenv_packages.txt +--- firefox-95.0/build/mach_virtualenv_packages.txt.pytpatch 2021-12-06 07:52:44.829038010 +0100 ++++ firefox-95.0/build/mach_virtualenv_packages.txt 2021-12-06 07:53:56.676269562 +0100 +@@ -1,7 +1,7 @@ + packages.txt:build/common_virtualenv_packages.txt + # glean-sdk may not be installable if a wheel isn't available + # and it has to be built from source. +-pypi-optional:glean-sdk==40.0.0:telemetry will not be collected ++pypi-optional:glean-sdk>=40.0.0,<=42.2.0:telemetry will not be collected + # Mach gracefully handles the case where `psutil` is unavailable. + # We aren't (yet) able to pin packages in automation, so we have to + # support down to the oldest locally-installed version (5.4.2). diff --git a/firefox-mozconfig b/firefox-mozconfig index 103bf15..90dfccf 100644 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -16,6 +16,7 @@ ac_add_options --with-system-fdk-aac ac_add_options --enable-js-shell ac_add_options --with-unsigned-addon-scopes=app,system ac_add_options --without-sysroot +ac_add_options --without-wasm-sandboxed-libraries export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/firefox.spec b/firefox.spec index 865699d..18d91b1 100644 --- a/firefox.spec +++ b/firefox.spec @@ -126,7 +126,7 @@ ExcludeArch: aarch64 %if %{?system_nss} %global nspr_version 4.26 %global nspr_build_version %{nspr_version} -%global nss_version 3.70 +%global nss_version 3.73 %global nss_build_version %{nss_version} %endif @@ -218,6 +218,7 @@ Patch54: mozilla-1669639.patch Patch55: firefox-testing.patch Patch57: firefox-disable-ffvpx-with-vapi.patch Patch61: firefox-glibc-dynstack.patch +Patch62: build-python.patch # Test patches # Generate without context by @@ -460,6 +461,7 @@ This package contains results of tests executed during build. #%patch55 -p1 -b .testing %patch57 -p1 -b .ffvpx-with-vapi #%patch61 -p1 -b .glibc-dynstack +%patch62 -p1 -b .build-python # Test patches #%patch100 -p1 -b .firefox-tests-xpcshell @@ -482,7 +484,7 @@ This package contains results of tests executed during build. %patch407 -p1 -b .1667096 %patch408 -p1 -b .1663844 %patch415 -p1 -b .1670333 -%patch420 -p1 -b .mochitest-wayland-workaround +#%patch420 -p1 -b .mochitest-wayland-workaround # PGO patches %if %{build_with_pgo} |