v110.0.1-1

2 files changed, 46 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1f9f0dfa0c2..c6feb90b1b6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = librewolf
 	pkgdesc = Community-maintained fork of Firefox, focused on privacy, security and freedom.
-	pkgver = 110.0
-	pkgrel = 2
+	pkgver = 110.0.1
+	pkgrel = 1
 	url = https://librewolf.net/
 	install = librewolf.install
 	arch = x86_64
@@ -14,6 +14,7 @@ pkgbase = librewolf
 	makedepends = clang
 	makedepends = diffutils
 	makedepends = dump_syms
+	makedepends = gawk
 	makedepends = git
 	makedepends = imake
 	makedepends = inetutils
@@ -55,16 +56,19 @@ pkgbase = librewolf
 	options = !strip
 	backup = usr/lib/librewolf/librewolf.cfg
 	backup = usr/lib/librewolf/distribution/policies.json
-	source = https://archive.mozilla.org/pub/firefox/releases/110.0/source/firefox-110.0.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/110.0/source/firefox-110.0.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/110.0.1/source/firefox-110.0.1.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/110.0.1/source/firefox-110.0.1.source.tar.xz.asc
 	source = librewolf.desktop
-	source = git+https://gitlab.com/librewolf-community/browser/source.git#commit=19d2fe15c83e448e0b11e0530a576875e408ceeb
+	source = git+https://gitlab.com/librewolf-community/browser/source.git#tag=110.0.1-1
 	source = git+https://gitlab.com/librewolf-community/settings.git#commit=ebec9c7db23ec1d1407da547b05207f49ff9c575
 	source = default192x192.png
 	source = 0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
 	source = https://raw.githubusercontent.com/archlinux/svntogit-packages/15a316eae92227054a924561172c8271bee7fc9c/trunk/0001-libwebrtc-screen-cast-sync.patch
+	source = https://raw.githubusercontent.com/archlinux/svntogit-packages/dd7a5fb35df6e31ee9591ab204fa2fe54e716155/trunk/0002-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
+	source = https://raw.githubusercontent.com/archlinux/svntogit-packages/5605b5d61b53ca4efc69132483a50c7b4d349dc9/trunk/0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch
+	source = https://raw.githubusercontent.com/archlinux/svntogit-packages/db42b54647606c5209acc94d94d95ae6cdeeef5d/trunk/0004-Bug-1821359-Disable-TLS-Key-Pinning-for-Twitter-Doma.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = d3882492190e4fdcfa142772cf35de5403effb011d24357b315d643ed9168a39
+	sha256sums = f19bb74d684b992625abca68f5776198974cd2785eb5d02d51ba007fc998491f
 	sha256sums = SKIP
 	sha256sums = 21054a5f41f38a017f3e1050ccc433d8e59304864021bef6b99f0d0642ccbe93
 	sha256sums = SKIP
@@ -72,6 +76,9 @@ pkgbase = librewolf
 	sha256sums = 959c94c68cab8d5a8cff185ddf4dca92e84c18dccc6dc7c8fe11c78549cdc2f1
 	sha256sums = 1d713370fe5a8788aa1723ca291ae2f96635b92bc3cb80aea85d21847c59ed6d
 	sha256sums = 43c83101b7ad7dba6f5fffeb89b70a661a547d506a031ea2beada42ccf04eec7
+	sha256sums = 9347e45cfe3e915b2293f7467fd61c216ec10823e91c70e5aeb9ca08cc5fcfcf
+	sha256sums = be9ba079a931d5e881ce38430d418cc834e8c6b157af6c79ea267998caece806
+	sha256sums = e4193f0a31a11ec6f5e16ac8d25c866867742d2c6917f34a87d73fa35eb55c55
 	source_aarch64 = 0001-libwebrtc-screen-cast-sync_additional_aarch64.patch
 	sha256sums_aarch64 = 358655062957b12255977714f3d04123857e562679cd35efb2b67b2e182a464a
 
diff --git a/PKGBUILD b/PKGBUILD
index 2f6f1ad3cd28..03f4e4947696 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=librewolf
 _pkgname=LibreWolf
-pkgver=110.0
-pkgrel=2
+pkgver=110.0.1
+pkgrel=1
 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
 url="https://librewolf.net/"
 arch=(x86_64 aarch64)
@@ -28,6 +28,7 @@ makedepends=(
   clang
   diffutils
   dump_syms
+  gawk
   git
   imake
   inetutils
@@ -69,8 +70,8 @@ options=(
 _arch_git=https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/firefox/trunk
 _arch_git_blob=https://raw.githubusercontent.com/archlinux/svntogit-packages
 # _source_tag="${pkgver}-${pkgrel%.*}"
-# _source_tag="${pkgver}-${pkgrel}"
-_source_commit='19d2fe15c83e448e0b11e0530a576875e408ceeb'
+_source_tag="${pkgver}-${pkgrel}"
+# _source_commit='19d2fe15c83e448e0b11e0530a576875e408ceeb'
 # _settings_tag='7.4'
 _settings_commit='ebec9c7db23ec1d1407da547b05207f49ff9c575'
 
@@ -78,23 +79,29 @@ 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/browser/source.git#tag=${_source_tag}"
   "git+https://gitlab.com/${pkgname}-community/settings.git#commit=${_settings_commit}"
   "default192x192.png"
   "0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch"
   "${_arch_git_blob}/15a316eae92227054a924561172c8271bee7fc9c/trunk/0001-libwebrtc-screen-cast-sync.patch"
+  "${_arch_git_blob}/dd7a5fb35df6e31ee9591ab204fa2fe54e716155/trunk/0002-Bug-1819374-Squashed-ffmpeg-6.0-update.patch"
+  "${_arch_git_blob}/5605b5d61b53ca4efc69132483a50c7b4d349dc9/trunk/0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch"
+  "${_arch_git_blob}/db42b54647606c5209acc94d94d95ae6cdeeef5d/trunk/0004-Bug-1821359-Disable-TLS-Key-Pinning-for-Twitter-Doma.patch"
 )
 
 source_aarch64=("0001-libwebrtc-screen-cast-sync_additional_aarch64.patch") # include scoped_glib.cc for aarch64 as well; breaks x86_64 build though?
 
-sha256sums=('d3882492190e4fdcfa142772cf35de5403effb011d24357b315d643ed9168a39'
+sha256sums=('f19bb74d684b992625abca68f5776198974cd2785eb5d02d51ba007fc998491f'
             'SKIP'
             '21054a5f41f38a017f3e1050ccc433d8e59304864021bef6b99f0d0642ccbe93'
             'SKIP'
             'SKIP'
             '959c94c68cab8d5a8cff185ddf4dca92e84c18dccc6dc7c8fe11c78549cdc2f1'
             '1d713370fe5a8788aa1723ca291ae2f96635b92bc3cb80aea85d21847c59ed6d'
-            '43c83101b7ad7dba6f5fffeb89b70a661a547d506a031ea2beada42ccf04eec7')
+            '43c83101b7ad7dba6f5fffeb89b70a661a547d506a031ea2beada42ccf04eec7'
+            '9347e45cfe3e915b2293f7467fd61c216ec10823e91c70e5aeb9ca08cc5fcfcf'
+            'be9ba079a931d5e881ce38430d418cc834e8c6b157af6c79ea267998caece806'
+            'e4193f0a31a11ec6f5e16ac8d25c866867742d2c6917f34a87d73fa35eb55c55')
 sha256sums_aarch64=('358655062957b12255977714f3d04123857e562679cd35efb2b67b2e182a464a')
 
 validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
@@ -215,6 +222,25 @@ fi
     patch -Np1 -i ../0001-libwebrtc-screen-cast-sync_additional_aarch64.patch
   fi
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1819374
+  # sooooo this will get a bit ugly, but I don't even want to find out if
+  # things would break on Manjaro until they update ffmpeg as well, so let's just
+  # not think tooooo much about it:
+  _ffmpeg_ver=$(pacman -Qi ffmpeg | gawk '/Version/{print $3}')
+  _ffmpeg_ver="${_ffmpeg_ver#*:}"
+  _ffmpeg_ver="${_ffmpeg_ver%.*}"
+  if [ "${_ffmpeg_ver}" -gt 5 ]; then
+    patch -Np1 -i ../0002-Bug-1819374-Squashed-ffmpeg-6.0-update.patch
+
+    # https://bugs.archlinux.org/task/77796
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1820416
+    patch -Np1 -i ../0003-Bug-1820416-Use-correct-FFVPX-headers-from-ffmpeg-6..patch
+  fi
+
+  # https://bugs.archlinux.org/task/77805
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1821359
+  patch -Np1 -i ../0004-Bug-1821359-Disable-TLS-Key-Pinning-for-Twitter-Doma.patch
+
   # upstream patches from gentoo
 
   # pgo improvements