From 95e023ae49542975dafe4b02314769c5014cb71d Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Wed, 9 Jun 2021 14:19:17 -0400 Subject: 89.0 from fedora --- .gitignore | 3 +- README.md | 30 + armhf-reduce-linker-memory-use.patch | 27 + cbindgen-vendor.tar.xz | Bin 0 -> 5624628 bytes context-menu.patch | 43 + fix-armhf-webrtc-build.patch | 65 ++ librewolf-branding.tgz | Bin 0 -> 1036752 bytes librewolf.cfg | 666 +++++++++++ librewolf.spec | 1738 +++++++++++++++++++++++++++++ megabar.patch | 166 +++ mozilla-vpn-ad.patch | 17 + reduce-rust-debuginfo.patch | 21 + relax-cargo-dep.patch | 11 + remove_addons.patch | 74 ++ sandbox-update-arm-syscall-numbers.patch | 144 +++ sources | 4 - use-system-icupkg.patch | 13 + webrtc-fix-compiler-flags-for-armhf.patch | 35 + 18 files changed, 3052 insertions(+), 5 deletions(-) create mode 100644 README.md create mode 100644 armhf-reduce-linker-memory-use.patch create mode 100644 cbindgen-vendor.tar.xz create mode 100644 context-menu.patch create mode 100644 fix-armhf-webrtc-build.patch create mode 100644 librewolf-branding.tgz create mode 100755 librewolf.cfg create mode 100644 librewolf.spec create mode 100644 megabar.patch create mode 100644 mozilla-vpn-ad.patch create mode 100644 reduce-rust-debuginfo.patch create mode 100644 relax-cargo-dep.patch create mode 100644 remove_addons.patch create mode 100644 sandbox-update-arm-syscall-numbers.patch delete mode 100644 sources create mode 100644 use-system-icupkg.patch create mode 100644 webrtc-fix-compiler-flags-for-armhf.patch diff --git a/.gitignore b/.gitignore index ff35ee1..c1c2cb4 100644 --- a/.gitignore +++ b/.gitignore @@ -314,7 +314,6 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-62.0.3-20181002.tar.xz /firefox-63.0.source.tar.xz /firefox-langpacks-63.0-20181018.tar.xz -/cbindgen-vendor.tar.xz /firefox-langpacks-63.0.1-20181101.tar.xz /firefox-63.0.1.source.tar.xz /firefox-63.0.3.source.tar.xz @@ -459,3 +458,5 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-88.0.1-20210510.tar.xz /firefox-langpacks-89.0-20210601.tar.xz /firefox-89.0.source.tar.xz +*.spec? +.*.swp diff --git a/README.md b/README.md new file mode 100644 index 0000000..48a88a6 --- /dev/null +++ b/README.md @@ -0,0 +1,30 @@ +# README for librewolf-fedora-ff + +## Overview +After using the [prep-librewolf-rpm.sh](https://gitlab.com/bgstack15/librewolf-fedora) script, a modified copy of Fedora Firefox src.rpm git repo exists on the local filesystem. + +If this README.md exists in a directory named `for-repo`, then it is still in its source location from the above link, and not in its final location. + +## This repository +This README file belongs in the modified copy of that Fedora Firefox src.rpm [git repository](https://src.fedoraproject.org/rpms/firefox). That modified git repo can be sent up to a [new web location](https://gitlab.com/bgstack15/librewolf-fedora-ff). + +Fedora [COPR](https://copr.fedorainfracloud.org/coprs/bgstack15/AfterMozilla/packages/) can then use rpkg to pull this new git repository, so users do not have to upload the 400MB src.rpm manually. + +## Using this repository +Script `git-helper.sh` included in the [librewolf-fedora](https://gitlab.com/bgstack15/librewolf-fedora) repository will add the new git repo for librewolf-fedora-ff and fix the .gitignore. + +## Differences from upstream repo +The Librewolf rpm git repo makes some changes to the Firefox rpm git repo. +Files are added or modified: +* this README.md +* .gitignore +* librewolf.spec +* LibreWolf patches that are not named here +* a few tarballs omitted from upstream git sources: + * cbindgen-vendor.tar.xz + * `firefox-langpacks-*.tar.xz` + +Files that are removed: +* sources + +Fedora's dist-git project provides a lookaside cache for large assets so they do not have to be stored in source control. The `sources` file links to those files, but we embed in the librewolf src.rpm the two tarballs we need. diff --git a/armhf-reduce-linker-memory-use.patch b/armhf-reduce-linker-memory-use.patch new file mode 100644 index 0000000..dbe74cf --- /dev/null +++ b/armhf-reduce-linker-memory-use.patch @@ -0,0 +1,27 @@ +Description: starting with firefox 66, armhf builds on Launchpad frequently + fail with "/usr/bin/ld: final link failed: memory exhausted" when linking + libxul.so. This is an attempt to reduce the memory used by ld. +Author: Olivier Tilloy + +--- a/build/moz.configure/toolchain.configure ++++ b/build/moz.configure/toolchain.configure +@@ -2349,15 +2349,17 @@ + set_config("LINKER_KIND", select_linker.KIND) + + +-@depends_if(select_linker, target, macos_sdk, sysroot_path, multiarch_dir) ++@depends_if(select_linker, target, macos_sdk, sysroot_path, multiarch_dir, host) + @imports("os") +-def linker_ldflags(linker, target, macos_sdk, sysroot_path, multiarch_dir): ++def linker_ldflags(linker, target, macos_sdk, sysroot_path, multiarch_dir, host): + flags = list((linker and linker.LINKER_FLAG) or []) + if target.kernel == "Darwin": + if linker and linker.KIND == "ld64": + flags.append("-Wl,-syslibroot,%s" % macos_sdk) + else: + flags.append("-Wl,--sysroot=%s" % macos_sdk) ++ if host.cpu == "arm": ++ flags.append("-Wl,--no-keep-memory") + + if sysroot_path and multiarch_dir: + for d in ("lib", "usr/lib"): diff --git a/cbindgen-vendor.tar.xz b/cbindgen-vendor.tar.xz new file mode 100644 index 0000000..9d6dda0 Binary files /dev/null and b/cbindgen-vendor.tar.xz differ diff --git a/context-menu.patch b/context-menu.patch new file mode 100644 index 0000000..5685f96 --- /dev/null +++ b/context-menu.patch @@ -0,0 +1,43 @@ +diff --git a/browser/base/content/browser-context.inc b/browser/base/content/browser-context.inc +--- a/browser/base/content/browser-context.inc ++++ b/browser/base/content/browser-context.inc +@@ -102,19 +102,16 @@ + oncommand="gContextMenu.openLinkInPrivateWindow();"/> + + + +- + + + + #endif + +- + +