v68.0.1-2

3 files changed, 14 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f12f8c54d511..5e6242c9f8cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = librewolf
 	pkgdesc = Community-maintained fork of Librefox: a privacy and security-focused browser
 	pkgver = 68.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://LibreWolf.gitlab.io
 	arch = x86_64
 	license = MPL
@@ -29,6 +29,7 @@ pkgbase = librewolf
 	makedepends = nasm
 	makedepends = git
 	makedepends = inkscape
+	makedepends = binutils
 	depends = gtk3
 	depends = mozilla-common
 	depends = libxt
@@ -50,10 +51,10 @@ pkgbase = librewolf
 	source = https://archive.mozilla.org/pub/firefox/releases/68.0.1/source/firefox-68.0.1.source.tar.xz
 	source = librewolf.desktop
 	source = librewolf.cfg.patch
-	source = git+https://gitlab.com/librewolf-community/librewolf.git#commit=e458edc5
+	source = git+https://gitlab.com/librewolf-community/librewolf.git#commit=1dde2d0e
 	sha256sums = 6037f77bdab29d79ca5e3fbd1d32f6c209e09d2066189a13dc7f7491227f5568
 	sha256sums = 0471d32366c6f415f7608b438ddeb10e2f998498c389217cdd6cc52e8249996b
-	sha256sums = 3a4499cdfd71f7ec590a78055ba9363d282b447c87c29a4b250ff7730c18a8ed
+	sha256sums = 3e2df22fa42f95bca8594cf07ed3ec6cc850fd121de4a283bf95c23eba1e467b
 	sha256sums = SKIP
 
 pkgname = librewolf
diff --git a/PKGBUILD b/PKGBUILD
index c9e90d6df2c2..a29f81689c0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=librewolf
 _pkgname=LibreWolf
 pkgver=68.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Community-maintained fork of Librefox: a privacy and security-focused browser"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -15,7 +15,7 @@ depends=(gtk3 mozilla-common libxt startup-notification 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 inkscape)
+             python nodejs python2-psutil cbindgen nasm git inkscape binutils)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -25,10 +25,10 @@ options=(!emptydirs !makeflags !strip)
 source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
         $pkgname.desktop
         $pkgname.cfg.patch
-        "git+https://gitlab.com/${pkgname}-community/${pkgname}.git#commit=e458edc5")
+        "git+https://gitlab.com/${pkgname}-community/${pkgname}.git#commit=1dde2d0e")
 sha256sums=('6037f77bdab29d79ca5e3fbd1d32f6c209e09d2066189a13dc7f7491227f5568'
             '0471d32366c6f415f7608b438ddeb10e2f998498c389217cdd6cc52e8249996b'
-            '3a4499cdfd71f7ec590a78055ba9363d282b447c87c29a4b250ff7730c18a8ed'
+            '3e2df22fa42f95bca8594cf07ed3ec6cc850fd121de4a283bf95c23eba1e467b'
             'SKIP')
 #
 # For telemetry and crash dump analysis to work correctly, we need to tell the
@@ -129,6 +129,10 @@ mk_add_options MOZ_CRASHREPORTER=0
 mk_add_options MOZ_DATA_REPORTING=0
 mk_add_options MOZ_SERVICES_HEALTHREPORT=0
 mk_add_options MOZ_TELEMETRY_REPORTING=0
+
+# options for ci / weaker build systems
+# mk_add_options MOZ_MAKE_FLAGS="-j2"
+# ac_add_options --enable-linker=gold
 END
 
   cp -r ${srcdir}/${pkgname}/browser/common/source_files/browser ./
@@ -149,7 +153,6 @@ build() {
   ulimit -n 4096
 
   # optional: use fewer cores when building
-  # export MOZ_MAKE_FLAGS="-j2"
   xvfb-run -a -n 97 -s "-screen 0 1600x1200x24" ./mach build
   ./mach buildsymbols
 }
diff --git a/librewolf.cfg.patch b/librewolf.cfg.patch
index d658e8ba6325..b72616a17979 100644
--- a/librewolf.cfg.patch
+++ b/librewolf.cfg.patch
@@ -1,8 +1,8 @@
 diff --git a/settings/librewolf.cfg b/settings/librewolf.cfg
-index bbe4450..351670e 100644
+index adb39b4..4d38cec 100644
 --- a/settings/librewolf.cfg
 +++ b/settings/librewolf.cfg
-@@ -94,11 +94,11 @@ user_pref("extensions.enabledAddons", "librefox.http.watcher.tor%40intika.be:2.8
+@@ -94,11 +94,11 @@ defaultPref("extensions.enabledAddons", "librefox.http.watcher.tor%40intika.be:2
  // User Settings : Cookies settings
  // --------------------------------