v107.0.1-1

3 files changed, 107 insertions, 100 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cc0dec5f752b..90a5992c061c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,72 +1,70 @@
 pkgbase = librewolf
 	pkgdesc = Community-maintained fork of Firefox, focused on privacy, security and freedom.
-	pkgver = 107.0
+	pkgver = 107.0.1
 	pkgrel = 1
 	url = https://librewolf.net/
 	install = librewolf.install
 	arch = x86_64
 	arch = aarch64
-	license = MPL
 	license = GPL
 	license = LGPL
-	makedepends = unzip
-	makedepends = zip
+	license = MPL
+	makedepends = binutils
+	makedepends = cbindgen
+	makedepends = clang
 	makedepends = diffutils
-	makedepends = yasm
-	makedepends = mesa
+	makedepends = dump_syms
+	makedepends = git
 	makedepends = imake
 	makedepends = inetutils
-	makedepends = xorg-server-xvfb
-	makedepends = autoconf2.13
-	makedepends = rust
-	makedepends = clang
-	makedepends = llvm
 	makedepends = jack
-	makedepends = nodejs
-	makedepends = cbindgen
+	makedepends = lld
+	makedepends = llvm
+	makedepends = mesa
 	makedepends = nasm
+	makedepends = nodejs
+	makedepends = pciutils
 	makedepends = python
-	makedepends = git
-	makedepends = binutils
-	makedepends = lld
-	makedepends = dump_syms
+	makedepends = rust
+	makedepends = unzip
 	makedepends = wasi-compiler-rt>13
-	makedepends = wasi-libc>=1:0+258+30094b6
 	makedepends = wasi-libc++>13
 	makedepends = wasi-libc++abi>13
-	makedepends = pciutils
+	makedepends = wasi-libc>=1:0+258+30094b6
+	makedepends = xorg-server-xvfb
+	makedepends = yasm
+	makedepends = zip
+	depends = dbus-glib
+	depends = ffmpeg
 	depends = gtk3
+	depends = libpulse
 	depends = libxt
 	depends = mime-types
-	depends = dbus-glib
 	depends = nss
 	depends = ttf-font
-	depends = libpulse
-	depends = ffmpeg
-	optdepends = networkmanager: Location detection via available WiFi networks
+	optdepends = hunspell-en_US: Spell checking, American English
 	optdepends = libnotify: Notification integration
+	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
-	optdepends = hunspell-en_US: Spell checking, American English
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
+	options = !debug
 	options = !emptydirs
+	options = !lto
 	options = !makeflags
 	options = !strip
-	options = !lto
-	options = !debug
 	backup = usr/lib/librewolf/librewolf.cfg
 	backup = usr/lib/librewolf/distribution/policies.json
-	source = https://archive.mozilla.org/pub/firefox/releases/107.0/source/firefox-107.0.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/107.0/source/firefox-107.0.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/107.0.1/source/firefox-107.0.1.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/107.0.1/source/firefox-107.0.1.source.tar.xz.asc
 	source = librewolf.desktop
-	source = git+https://gitlab.com/librewolf-community/browser/source.git#commit=3c61a7f27eb18e8412826af2b85eaabe3e5d6a10
-	source = git+https://gitlab.com/librewolf-community/settings.git#commit=486637e9dfd1352e427e73eef354d22bfbd026f5
+	source = git+https://gitlab.com/librewolf-community/browser/source.git#tag=107.0.1-1
+	source = git+https://gitlab.com/librewolf-community/settings.git#tag=7.3
 	source = default192x192.png
 	source = 0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
 	source = https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/firefox/trunk/0001-libwebrtc-screen-cast-sync.patch
-	source = 0001-allow-JXL-in-non-nightly-browser.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 8a562e5a397b57e9bf383c2988308ab494c5d28844e792c658fedea27756584a
+	sha256sums = e29950b9ba9143b0d683dc18779bbe70bbd082533aff8f6a7af69b19533e0647
 	sha256sums = SKIP
 	sha256sums = 21054a5f41f38a017f3e1050ccc433d8e59304864021bef6b99f0d0642ccbe93
 	sha256sums = SKIP
@@ -74,6 +72,5 @@ pkgbase = librewolf
 	sha256sums = 959c94c68cab8d5a8cff185ddf4dca92e84c18dccc6dc7c8fe11c78549cdc2f1
 	sha256sums = 1d713370fe5a8788aa1723ca291ae2f96635b92bc3cb80aea85d21847c59ed6d
 	sha256sums = 5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286
-	sha256sums = b6c9026cdfe8c5155af57cf1012f4ab1a08e5860fb0513db90a91e34cdfad7fe
 
 pkgname = librewolf
diff --git a/0001-allow-JXL-in-non-nightly-browser.patch b/0001-allow-JXL-in-non-nightly-browser.patch
deleted file mode 100644
index df6de424f4ba..000000000000
--- a/0001-allow-JXL-in-non-nightly-browser.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 55d449fbb8855ce34c047a4b031f0bd1d9f782e8 Mon Sep 17 00:00:00 2001
-From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
-Date: Wed, 16 Nov 2022 09:53:57 +0100
-Subject: [PATCH] allow JXL in non nightly browser
-
----
- toolkit/moz.configure | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index c99b4d628c54..0b1b1614620a 100644
---- a/toolkit/moz.configure
-+++ b/toolkit/moz.configure
-@@ -703,9 +703,10 @@ set_define("MOZ_AV1", av1)
- option("--disable-jxl", help="Disable jxl image support")
- 
- 
--@depends("--disable-jxl", milestone.is_nightly)
--def jxl(value, is_nightly):
--    if is_nightly and value:
-+@depends("--disable-jxl")
-+def jxl(value):
-+    enabled = bool(value)
-+    if enabled:
-         return True
- 
- 
--- 
-2.38.1
-
diff --git a/PKGBUILD b/PKGBUILD
index c8065e12eee7..16ec676bd12e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,51 +2,95 @@
 
 pkgname=librewolf
 _pkgname=LibreWolf
-pkgver=107.0
+pkgver=107.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.net/"
-depends=(gtk3 libxt mime-types dbus-glib nss ttf-font libpulse ffmpeg)
-makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
-             autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python
-             git binutils lld dump_syms
-             'wasi-compiler-rt>13' 'wasi-libc>=1:0+258+30094b6' 'wasi-libc++>13' 'wasi-libc++abi>13' pciutils) # pciutils: only to avoid some PGO warning
-optdepends=('networkmanager: Location detection via available WiFi networks'
-            'libnotify: Notification integration'
-            'pulseaudio: Audio support'
-            'speech-dispatcher: Text-to-Speech'
-            'hunspell-en_US: Spell checking, American English'
-            'xdg-desktop-portal: Screensharing with Wayland')
+arch=(x86_64 aarch64)
+license=(
+  GPL
+  LGPL
+  MPL
+)
+depends=(
+  dbus-glib
+  ffmpeg
+  gtk3
+  libpulse
+  libxt
+  mime-types
+  nss
+  ttf-font
+)
+makedepends=(
+  binutils
+  cbindgen
+  clang
+  diffutils
+  dump_syms
+  git
+  imake
+  inetutils
+  jack
+  lld
+  llvm
+  mesa
+  nasm
+  nodejs
+  pciutils
+  python
+  rust
+  unzip
+  'wasi-compiler-rt>13'
+  'wasi-libc++>13'
+  'wasi-libc++abi>13'
+  'wasi-libc>=1:0+258+30094b6'
+  xorg-server-xvfb
+  yasm
+  zip
+) # pciutils: only to avoid some PGO warning
+optdepends=(
+  'hunspell-en_US: Spell checking, American English'
+  'libnotify: Notification integration'
+  'networkmanager: Location detection via available WiFi networks'
+  'pulseaudio: Audio support'
+  'speech-dispatcher: Text-to-Speech'
+  'xdg-desktop-portal: Screensharing with Wayland'
+)
 backup=('usr/lib/librewolf/librewolf.cfg'
         'usr/lib/librewolf/distribution/policies.json')
-options=(!emptydirs !makeflags !strip !lto !debug)
+options=(
+  !debug
+  !emptydirs
+  !lto
+  !makeflags
+  !strip
+)
 _arch_git=https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/firefox/trunk
 # _source_tag="${pkgver}-${pkgrel%.*}"
 _source_tag="${pkgver}-${pkgrel}"
-_source_commit='3c61a7f27eb18e8412826af2b85eaabe3e5d6a10'
-# _settings_tag='7.2-hotfix'
-_settings_commit='486637e9dfd1352e427e73eef354d22bfbd026f5'
+# _source_commit='3c61a7f27eb18e8412826af2b85eaabe3e5d6a10'
+_settings_tag='7.3'
+# _settings_commit='486637e9dfd1352e427e73eef354d22bfbd026f5'
+
 install='librewolf.install'
-source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
-        $pkgname.desktop
-        "git+https://gitlab.com/${pkgname}-community/browser/source.git#commit=${_source_commit}"
-        "git+https://gitlab.com/${pkgname}-community/settings.git#commit=${_settings_commit}"
-        "default192x192.png"
-        "0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch"
-        "${_arch_git}/0001-libwebrtc-screen-cast-sync.patch"
-        '0001-allow-JXL-in-non-nightly-browser.patch'
-        )
-sha256sums=('8a562e5a397b57e9bf383c2988308ab494c5d28844e792c658fedea27756584a'
+source=(
+  https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
+  $pkgname.desktop
+  "git+https://gitlab.com/${pkgname}-community/browser/source.git#tag=${_source_tag}"
+  "git+https://gitlab.com/${pkgname}-community/settings.git#tag=${_settings_tag}"
+  "default192x192.png"
+  "0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch"
+  "${_arch_git}/0001-libwebrtc-screen-cast-sync.patch"
+)
+sha256sums=('e29950b9ba9143b0d683dc18779bbe70bbd082533aff8f6a7af69b19533e0647'
             'SKIP'
             '21054a5f41f38a017f3e1050ccc433d8e59304864021bef6b99f0d0642ccbe93'
             'SKIP'
             'SKIP'
             '959c94c68cab8d5a8cff185ddf4dca92e84c18dccc6dc7c8fe11c78549cdc2f1'
             '1d713370fe5a8788aa1723ca291ae2f96635b92bc3cb80aea85d21847c59ed6d'
-            '5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286'
-            'b6c9026cdfe8c5155af57cf1012f4ab1a08e5860fb0513db90a91e34cdfad7fe')
+            '5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286')
 
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
 
@@ -168,9 +212,6 @@ fi
 
   # LibreWolf
 
-  # experimental: allow enabling JPEG XL in non-nightly browser
-  patch -Np1 -i ${srcdir}/0001-allow-JXL-in-non-nightly-browser.patch
-
   # Remove some pre-installed addons that might be questionable
   patch -Np1 -i ${_patches_dir}/remove_addons.patch
 
@@ -187,10 +228,6 @@ fi
   # Disabling Pocket
   patch -Np1 -i ${_patches_dir}/sed-patches/disable-pocket.patch
 
-  # Remove Internal Plugin Certificates
-  # patch -Np1 -i ${_patches_dir}/sed-patches/remove-internal-plugin-certs.patch
-  # => breaks profiled builds since 90.0, it seems
-
   # allow SearchEngines option in non-ESR builds
   patch -Np1 -i ${_patches_dir}/sed-patches/allow-searchengines-non-esr.patch
 
@@ -205,6 +242,9 @@ fi
   patch -Np1 -i ${_patches_dir}/context-menu.patch
   patch -Np1 -i ${_patches_dir}/urlbarprovider-interventions.patch
 
+# allow enabling JPEG XL in non-nightly browser
+  patch -Np1 -i ${_patches_dir}/allow-JXL-in-non-nightly-browser.patch
+
   # change some hardcoded directory strings that could lead to unnecessarily
   # created directories
   patch -Np1 -i ${_patches_dir}/mozilla_dirs.patch