v77.0.1-1

4 files changed, 135 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 756b38f96d8a..d2879f031a3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = librewolf
 	pkgdesc = Community-maintained fork of Firefox, focused on privacy, security and freedom.
-	pkgver = 76.0.1
+	pkgver = 77.0.1
 	pkgrel = 1
 	url = https://librewolf-community.gitlab.io/
 	arch = x86_64
@@ -32,7 +32,6 @@ pkgbase = librewolf
 	makedepends = binutils
 	depends = gtk3
 	depends = libxt
-	depends = startup-notification
 	depends = mime-types
 	depends = dbus-glib
 	depends = ffmpeg
@@ -47,16 +46,34 @@ pkgbase = librewolf
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = https://archive.mozilla.org/pub/firefox/releases/76.0.1/source/firefox-76.0.1.source.tar.xz
-	source = librewolf.desktop
-	source = git+https://gitlab.com/librewolf-community/browser/common.git
-	source = git+https://gitlab.com/librewolf-community/settings.git
-	source = remove_addons.patch
-	sha256sums = f61761e32774a6bdfedd5937c4992fbe5e24c3df057c2b9a559fcd0d038777c3
-	sha256sums = 0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = 4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0
+	source_x86_64 = https://archive.mozilla.org/pub/firefox/releases/77.0.1/source/firefox-77.0.1.source.tar.xz
+	source_x86_64 = librewolf.desktop
+	source_x86_64 = git+https://gitlab.com/librewolf-community/browser/common.git
+	source_x86_64 = git+https://gitlab.com/librewolf-community/settings.git
+	source_x86_64 = megabar.patch
+	source_x86_64 = remove_addons.patch
+	sha256sums_x86_64 = 54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640
+	sha256sums_x86_64 = 0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2
+	sha256sums_x86_64 = SKIP
+	sha256sums_x86_64 = SKIP
+	sha256sums_x86_64 = 1130fb4c737ed7bb5f62e008133efe5d830b71e93af91f251dfeee68d190d27d
+	sha256sums_x86_64 = 4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0
+	source_aarch64 = https://archive.mozilla.org/pub/firefox/releases/77.0.1/source/firefox-77.0.1.source.tar.xz
+	source_aarch64 = librewolf.desktop
+	source_aarch64 = git+https://gitlab.com/librewolf-community/browser/common.git
+	source_aarch64 = git+https://gitlab.com/librewolf-community/settings.git
+	source_aarch64 = megabar.patch
+	source_aarch64 = remove_addons.patch
+	source_aarch64 = arm.patch
+	source_aarch64 = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch
+	sha256sums_aarch64 = 54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640
+	sha256sums_aarch64 = 0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2
+	sha256sums_aarch64 = SKIP
+	sha256sums_aarch64 = SKIP
+	sha256sums_aarch64 = 1130fb4c737ed7bb5f62e008133efe5d830b71e93af91f251dfeee68d190d27d
+	sha256sums_aarch64 = 4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0
+	sha256sums_aarch64 = 6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7
+	sha256sums_aarch64 = 2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9
 
 pkgname = librewolf
 
diff --git a/PKGBUILD b/PKGBUILD
index 75dde46d2e91..5a471105a70b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,13 @@
 
 pkgname=librewolf
 _pkgname=LibreWolf
-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)
@@ -22,23 +21,35 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'speech-dispatcher: Text-to-Speech'
             'hunspell-en_US: Spell checking, American English')
 options=(!emptydirs !makeflags !strip)
-source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
-        $pkgname.desktop
-        "git+https://gitlab.com/${pkgname}-community/browser/common.git"
-        "git+https://gitlab.com/${pkgname}-community/settings.git"
-        "remove_addons.patch")
-sha256sums=('f61761e32774a6bdfedd5937c4992fbe5e24c3df057c2b9a559fcd0d038777c3'
-            '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
-            'SKIP'
-            'SKIP'
-            '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0')
-
-if [[ $CARCH == 'aarch64' ]]; then
-  source+=(arm.patch
-           https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch)
-  sha256sums+=('6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7'
-               '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
-fi
+source_x86_64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
+               $pkgname.desktop
+               "git+https://gitlab.com/${pkgname}-community/browser/common.git"
+               "git+https://gitlab.com/${pkgname}-community/settings.git"
+               "megabar.patch"
+               "remove_addons.patch")
+source_aarch64=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
+                $pkgname.desktop
+                "git+https://gitlab.com/${pkgname}-community/browser/common.git"
+                "git+https://gitlab.com/${pkgname}-community/settings.git"
+                "megabar.patch"
+                "remove_addons.patch"
+                arm.patch
+                https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch)
+
+sha256sums_x86_64=('54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640'
+                   '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
+                   'SKIP'
+                   'SKIP'
+                   '1130fb4c737ed7bb5f62e008133efe5d830b71e93af91f251dfeee68d190d27d'
+                   '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0')
+sha256sums_aarch64=('54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640'
+                    '0b28ba4cc2538b7756cb38945230af52e8c4659b2006262da6f3352345a8bed2'
+                    'SKIP'
+                    'SKIP'
+                    '1130fb4c737ed7bb5f62e008133efe5d830b71e93af91f251dfeee68d190d27d'
+                    '4425388d62cbb7ec3808926ae5e04021b17af8a0b6ba47c08a253ecfdcc264c0'
+                    '6ca87d2ac7dc48e6f595ca49ac8151936afced30d268a831c6a064b52037f6b7'
+                    '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 
 prepare() {
   mkdir mozbuild
@@ -74,9 +85,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
 
@@ -108,10 +117,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
 
@@ -124,6 +129,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/arm.patch b/arm.patch
new file mode 100644
index 000000000000..0e0d6486115a
--- /dev/null
+++ b/arm.patch
@@ -0,0 +1,12 @@
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
+index f8977a6..34f52fc 100644
+--- a/js/src/wasm/WasmSignalHandlers.cpp
++++ b/js/src/wasm/WasmSignalHandlers.cpp
+@@ -243,7 +243,7 @@ using mozilla::DebugOnly;
+ // If you run into compile problems on a tier-3 platform, you can disable the
+ // emulation here.
+ 
+-#if defined(__linux__) && defined(__arm__)
++#if 0 && defined(__linux__) && defined(__arm__)
+ #  define WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
+ #endif
diff --git a/megabar.patch b/megabar.patch
new file mode 100644
index 000000000000..02e7f0f983fe
--- /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();
+       });