diff options
| -rw-r--r-- | CHANGELOG.md | 10 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rwxr-xr-x | binary_tarball/scripts/3_Configure_Source_Code.sh | 7 | ||||
| -rwxr-xr-x | binary_tarball/scripts/4_Build_Binary_Tarball.sh | 2 | ||||
| -rw-r--r-- | deb_patches/add-missing-include-functional.patch | 14 | ||||
| -rw-r--r-- | deb_patches/build-with-libstdc++-7.patch | 9 | ||||
| -rw-r--r-- | megabar.patch | 59 |
7 files changed, 88 insertions, 32 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d91e962..f4f070b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). This project follows the official Firefox releases, but also uses [Arch Linux Package Versioning](https://wiki.archlinux.org/index.php/Arch_package_guidelines#Package_versioning) to mark individual releases in between versions. +## [77.0.1-1] - 2020-06-06 + +### Changed + +- New upstream release 77.0.1 + +### Fixed + +- Disable "Megabar" functionality (#23) + ## [76.0.1-1] - 2020-05-08 ### Changed @@ -6,14 +6,13 @@ pkgname=librewolf _pkgname=LibreWolf # how to get ci vars instead? -pkgver=76.0.1 +pkgver=77.0.1 pkgrel=1 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom." arch=(x86_64 aarch64) license=(MPL GPL LGPL) url="https://librewolf-community.gitlab.io/" -depends=(gtk3 libxt startup-notification mime-types dbus-glib ffmpeg nss - ttf-font libpulse) +depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse) makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 python nodejs python2-psutil cbindgen nasm git binutils) @@ -27,11 +26,13 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox- $pkgname.desktop "git+https://gitlab.com/${pkgname}-community/browser/common.git" "git+https://gitlab.com/${pkgname}-community/settings.git" + "megabar.patch" "remove_addons.patch") -sha256sums=('f61761e32774a6bdfedd5937c4992fbe5e24c3df057c2b9a559fcd0d038777c3' +sha256sums=('54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640' '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2' 'SKIP' 'SKIP' + '1130fb4c737ed7bb5f62e008133efe5d830b71e93af91f251dfeee68d190d27d' '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0') if [[ $CARCH == 'aarch64' ]]; then @@ -75,9 +76,7 @@ export MOZ_REQUIRE_SIGNING=0 # Features ac_add_options --enable-alsa ac_add_options --enable-jack -ac_add_options --enable-startup-notification ac_add_options --disable-crashreporter -ac_add_options --disable-gconf ac_add_options --disable-updater ac_add_options --disable-tests @@ -109,10 +108,6 @@ END export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" patch -p1 -i ../arm.patch patch -p1 -i ../build-arm-libopus.patch - # do we need those for aarch64 as well? - # well, let's try it without them ^^ - # patch -p1 -i ../fix-armhf-webrtc-build.patch - # patch -p1 -i ../webrtc-fix-compiler-flags-for-armhf.patch else @@ -125,6 +120,10 @@ fi # Remove some pre-installed addons that might be questionable patch -p1 -i ../remove_addons.patch + # Disable (some) megabar functionality + # Adapted from https://github.com/WesleyBranton/userChrome.css-Customizations + patch -p1 -i ../megabar.patch + # Disabling Pocket sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build # this one only to remove an annoying error message: diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index dc8fea4..a7fb24f 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -55,9 +55,7 @@ export MOZ_REQUIRE_SIGNING=0 # Features ac_add_options --enable-alsa ac_add_options --enable-jack -ac_add_options --enable-startup-notification ac_add_options --disable-crashreporter -ac_add_options --disable-gconf ac_add_options --disable-updater ac_add_options --disable-tests @@ -120,11 +118,14 @@ fi patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/drop-check-glibc-symbols.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/build-with-libstdc++-7.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/drop-libstdcxx-check.patch" -patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/add-missing-include-functional.patch" # Remove some pre-installed addons that might be questionable patch -p1 -i ${CI_PROJECT_DIR}/remove_addons.patch +# Disable (some) megabar functionality +# Adapted from https://github.com/WesleyBranton/userChrome.css-Customizations +patch -p1 -i ${CI_PROJECT_DIR}/megabar.patch + # Disabling Pocket printf "\nDisabling Pocket\n"; sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build diff --git a/binary_tarball/scripts/4_Build_Binary_Tarball.sh b/binary_tarball/scripts/4_Build_Binary_Tarball.sh index 33e12ad..5820519 100755 --- a/binary_tarball/scripts/4_Build_Binary_Tarball.sh +++ b/binary_tarball/scripts/4_Build_Binary_Tarball.sh @@ -61,7 +61,7 @@ rm -f mozconfig # source /root/.cargo/env # install cbindgen -cargo install --version 0.13.2 cbindgen +cargo install --version 0.14.2 cbindgen if [[ $CARCH == 'aarch64' ]]; then diff --git a/deb_patches/add-missing-include-functional.patch b/deb_patches/add-missing-include-functional.patch deleted file mode 100644 index d1ff90e..0000000 --- a/deb_patches/add-missing-include-functional.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: add missing #include directive for the use of std::function -Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1626972 -Author: Olivier Tilloy <olivier.tilloy@canonical.com> - ---- a/image/imgFrame.h -+++ b/image/imgFrame.h -@@ -7,6 +7,7 @@ - #ifndef mozilla_image_imgFrame_h - #define mozilla_image_imgFrame_h - -+#include <functional> - #include <utility> - - #include "AnimationParams.h" diff --git a/deb_patches/build-with-libstdc++-7.patch b/deb_patches/build-with-libstdc++-7.patch index 11812d6..c1279e0 100644 --- a/deb_patches/build-with-libstdc++-7.patch +++ b/deb_patches/build-with-libstdc++-7.patch @@ -4,7 +4,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure -@@ -1433,6 +1433,9 @@ set_config('_DEPEND_CFLAGS', depend_cfla +@@ -1433,6 +1433,9 @@ set_config('_DEPEND_CFLAGS', depend_cflags(c_compiler)) set_config('_HOST_DEPEND_CFLAGS', depend_cflags(host_c_compiler)) @@ -14,10 +14,11 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861 @depends(c_compiler) def preprocess_option(compiler): # The uses of PREPROCESS_OPTION depend on the spacing for -o/-Fi. -@@ -2118,6 +2121,7 @@ def linker_ldflags(linker, macos_sdk, ho +@@ -2125,7 +2128,7 @@ def linker_ldflags(linker, macos_sdk): + flags.append('-Wl,-syslibroot,%s' % macos_sdk) + else: flags.append('-Wl,--sysroot=%s' % macos_sdk) - elif host.cpu == 'arm': - flags.append('-Wl,--no-keep-memory') +- + flags.append('-static-libstdc++') return flags diff --git a/megabar.patch b/megabar.patch new file mode 100644 index 0000000..02e7f0f --- /dev/null +++ b/megabar.patch @@ -0,0 +1,59 @@ +diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm +index c557a10..3f8f1d4 100644 +--- a/browser/components/urlbar/UrlbarInput.jsm ++++ b/browser/components/urlbar/UrlbarInput.jsm +@@ -1085,18 +1085,18 @@ class UrlbarInput { + } + this.removeAttribute("breakout-extend-disabled"); + +- this._toolbar.setAttribute("urlbar-exceeds-toolbar-bounds", "true"); +- this.setAttribute("breakout-extend", "true"); ++ // this._toolbar.setAttribute("urlbar-exceeds-toolbar-bounds", "true"); ++ // this.setAttribute("breakout-extend", "true"); + + // Enable the animation only after the first extend call to ensure it + // doesn't run when opening a new window. +- if (!this.hasAttribute("breakout-extend-animate")) { +- this.window.promiseDocumentFlushed(() => { +- this.window.requestAnimationFrame(() => { +- this.setAttribute("breakout-extend-animate", "true"); +- }); +- }); +- } ++ // if (!this.hasAttribute("breakout-extend-animate")) { ++ // this.window.promiseDocumentFlushed(() => { ++ // this.window.requestAnimationFrame(() => { ++ // this.setAttribute("breakout-extend-animate", "true"); ++ // }); ++ // }); ++ // } + } + + endLayoutExtend() { +@@ -1186,8 +1186,13 @@ class UrlbarInput { + let updateKey = {}; + this._layoutBreakoutUpdateKey = updateKey; + +- this.removeAttribute("breakout"); +- this.textbox.parentNode.removeAttribute("breakout"); ++ if (this.hasAttribute("breakout")) { ++ this.removeAttribute("breakout"); ++ } ++ ++ if (this.textbox.parentNode.hasAttribute("breakout")) { ++ this.textbox.parentNode.removeAttribute("breakout"); ++ } + + await this.window.promiseDocumentFlushed(() => {}); + await new Promise(resolve => { +@@ -1209,8 +1214,8 @@ class UrlbarInput { + px(getBoundsWithoutFlushing(this._toolbar).height) + ); + +- this.setAttribute("breakout", "true"); +- this.textbox.parentNode.setAttribute("breakout", "true"); ++ // this.setAttribute("breakout", "true"); ++ // this.textbox.parentNode.setAttribute("breakout", "true"); + + resolve(); + }); |