summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2021-12-14 16:05:10 -0500
committerB. Stack <bgstack15@gmail.com>2021-12-14 16:05:10 -0500
commitde8c7396a73fab95a654ba3bd224ffce792857e0 (patch)
treea8e08f2dd688eab59911ca786de32bcdce9b4262
parent95.0 attempt 2 (diff)
downloadlibrewolf-fedora-ff-de8c7396a73fab95a654ba3bd224ffce792857e0.tar.gz
librewolf-fedora-ff-de8c7396a73fab95a654ba3bd224ffce792857e0.tar.bz2
librewolf-fedora-ff-de8c7396a73fab95a654ba3bd224ffce792857e0.zip
fix patches
-rw-r--r--build-python.patch12
-rw-r--r--remove_addons.patch2
2 files changed, 13 insertions, 1 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/remove_addons.patch b/remove_addons.patch
index a6585ed..3487f6d 100644
--- a/remove_addons.patch
+++ b/remove_addons.patch
@@ -13,7 +13,7 @@ index 269dcb2..ed7c31d 100644
- "report-site-issue",
"pictureinpicture",
"proxy-failover",
- ]
+ "search-detection",
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 496379c..dd6f359 100644
--- a/browser/locales/Makefile.in
bgstack15