v119.0-5

3 files changed, 8 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ea67babe7fc..5a2f79b8c440 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = librewolf
 	pkgdesc = Community-maintained fork of Firefox, focused on privacy, security and freedom.
-	pkgver = 118.0.2
-	pkgrel = 1
+	pkgver = 119.0
+	pkgrel = 5
 	url = https://librewolf.net/
 	install = librewolf.install
 	arch = x86_64
@@ -56,14 +56,12 @@ pkgbase = librewolf
 	options = !strip
 	backup = usr/lib/librewolf/librewolf.cfg
 	backup = usr/lib/librewolf/distribution/policies.json
-	source = https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/118.0.2-1/librewolf-118.0.2-1.source.tar.gz
+	source = https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/119.0-5/librewolf-119.0-5.source.tar.gz
 	source = librewolf.desktop
 	source = default192x192.png
-	source = https://gitlab.archlinux.org/archlinux/packaging/packages/firefox/-/raw/f021e2ed225da9cc3b667e7ef9a60163607b407f/0001-Bug-1849874-Update-from-packed_simd_2-to-packed_simd.patch
 	validpgpkeys = 034F7776EF5E0C613D2F7934D29FBD5F93C0CFC3
-	sha256sums = daf30073d360f8024d8ebbe5532e829bec11177239538f482221a4c5ded52d60
+	sha256sums = 2002c2c5856b59de91d895f7e5f4997a249ba2b8d9e65b77d51a22d7d820839b
 	sha256sums = 7d01d317b7db7416783febc18ee1237ade2ec86c1567e2c2dd628a94cbf2f25d
 	sha256sums = 959c94c68cab8d5a8cff185ddf4dca92e84c18dccc6dc7c8fe11c78549cdc2f1
-	sha256sums = 2406c4c2e18d535c0c7900fe7b176137ae130a75806a19516854894555b69e72
 
 pkgname = librewolf
diff --git a/0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch b/0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
deleted file mode 100644
index 70cf5c3c725b..000000000000
--- a/0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 2502829abc1a02a08cc1934538c3d30e6f4f6fae Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Mon, 6 Apr 2020 20:27:06 +0200
-Subject: [PATCH 19/30] bmo#1516081: Disable watchdog during PGO builds
-
-Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1516081
-Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
----
- build/moz.configure/lto-pgo.configure          | 4 ++--
- toolkit/components/terminator/nsTerminator.cpp | 7 +++++++
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure
-index e5a4e6f913..567ccf0ba4 100644
---- a/build/moz.configure/lto-pgo.configure
-+++ b/build/moz.configure/lto-pgo.configure
-@@ -84,7 +84,7 @@ set_config("PGO_PROFILE_PATH", pgo_profile_path)
- def pgo_flags(compiler, profdata, target_is_windows):
-     if compiler.type == "gcc":
-         return namespace(
--            gen_cflags=["-fprofile-generate"],
-+            gen_cflags=["-fprofile-generate", "-DMOZ_PROFILE_INSTRUMENTATION"],
-             gen_ldflags=["-fprofile-generate"],
-             use_cflags=["-fprofile-use", "-fprofile-correction", "-Wcoverage-mismatch"],
-             use_ldflags=["-fprofile-use"],
-@@ -98,7 +98,7 @@ def pgo_flags(compiler, profdata, target_is_windows):
-         else:
-             gen_ldflags = ["-fprofile-generate"]
- 
--        gen_cflags = [prefix + "-fprofile-generate"]
-+        gen_cflags = [prefix + "-fprofile-generate", "-DMOZ_PROFILE_INSTRUMENTATION"]
-         if target_is_windows:
-             # native llvm-profdata.exe on Windows can't read profile data
-             # if name compression is enabled (which cross-compiling enables
-diff --git a/toolkit/components/terminator/nsTerminator.cpp b/toolkit/components/terminator/nsTerminator.cpp
-index 194bb36e2d..c960d44137 100644
---- a/toolkit/components/terminator/nsTerminator.cpp
-+++ b/toolkit/components/terminator/nsTerminator.cpp
-@@ -466,6 +466,13 @@ void nsTerminator::StartWatchdog() {
-   }
- #endif
- 
-+  // Disable watchdog for PGO train builds - writting profile information at
-+  // exit may take time and it is better to make build hang rather than
-+  // silently produce poorly performing binary.
-+#ifdef MOZ_PROFILE_INSTRUMENTATION
-+  crashAfterMS = INT32_MAX;
-+#endif
-+
-   UniquePtr<Options> options(new Options());
-   const PRIntervalTime ticksDuration =
-       PR_MillisecondsToInterval(HEARTBEAT_INTERVAL_MS);
--- 
-2.34.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 898678f332a7..1bf843ccd07a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=librewolf
 _pkgname=LibreWolf
-pkgver=118.0.2
-pkgrel=1
+pkgver=119.0
+pkgrel=5
 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
 url="https://librewolf.net/"
 arch=(x86_64 aarch64)
@@ -75,13 +75,11 @@ source=(
   https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${pkgver}-${pkgrel}/librewolf-${pkgver}-${pkgrel}.source.tar.gz # {,.sig} sig files are currently broken, it seems
   $pkgname.desktop
   "default192x192.png"
-  https://gitlab.archlinux.org/archlinux/packaging/packages/firefox/-/raw/f021e2ed225da9cc3b667e7ef9a60163607b407f/0001-Bug-1849874-Update-from-packed_simd_2-to-packed_simd.patch
 )
 
-sha256sums=('daf30073d360f8024d8ebbe5532e829bec11177239538f482221a4c5ded52d60'
+sha256sums=('2002c2c5856b59de91d895f7e5f4997a249ba2b8d9e65b77d51a22d7d820839b'
             '7d01d317b7db7416783febc18ee1237ade2ec86c1567e2c2dd628a94cbf2f25d'
-            '959c94c68cab8d5a8cff185ddf4dca92e84c18dccc6dc7c8fe11c78549cdc2f1'
-            '2406c4c2e18d535c0c7900fe7b176137ae130a75806a19516854894555b69e72')
+            '959c94c68cab8d5a8cff185ddf4dca92e84c18dccc6dc7c8fe11c78549cdc2f1')
 
 validpgpkeys=('034F7776EF5E0C613D2F7934D29FBD5F93C0CFC3') # maltej(?)
 
@@ -93,10 +91,6 @@ prepare() {
   mkdir -p mozbuild
   cd librewolf-$pkgver-$pkgrel
 
-  # Unbreak build with Rust 1.73.0
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1849874
-  patch -Np1 -i ../0001-Bug-1849874-Update-from-packed_simd_2-to-packed_simd.patch
-
   mv mozconfig ../mozconfig
 
   cat >>../mozconfig <<END