113.0.1-1

4 files changed, 21 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6061c1170c44..3fee88141536 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-vaapi
 	pkgdesc = Standalone web browser from mozilla.org (with VA-API patches)
-	pkgver = 113.0
+	pkgver = 113.0.1
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	arch = x86_64
@@ -43,31 +43,28 @@ pkgbase = firefox-vaapi
 	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
-	provides = firefox=113.0
+	provides = firefox=113.0.1
 	conflicts = firefox
 	options = !debug
 	options = !emptydirs
 	options = !lto
 	options = !makeflags
 	options = !strip
-	source = https://archive.mozilla.org/pub/firefox/releases/113.0/source/firefox-113.0.source.tar.xz
-	source = https://archive.mozilla.org/pub/firefox/releases/113.0/source/firefox-113.0.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/firefox/releases/113.0.1/source/firefox-113.0.1.source.tar.xz
+	source = https://archive.mozilla.org/pub/firefox/releases/113.0.1/source/firefox-113.0.1.source.tar.xz.asc
 	source = firefox.desktop
 	source = identity-icons-brand.svg
-	source = 0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
-	source = 0002-enable-vaapi.patch
+	source = 0001-enable-vaapi.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
-	sha256sums = 7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627
+	sha256sums = c4f86ecbb3f418cf8f0000a3824c0decb6ef2253f468cf6e005c5fd1de33da4d
 	sha256sums = SKIP
 	sha256sums = 298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
-	sha256sums = 1976c0c5e98b0f67e83de778a4fd7729de9b140efa47b77b5879ea2e907987e9
-	sha256sums = b1298c8e9dbaa3a9af04538a80f4c592394fe702c9a4380f8ff71b1795194667
-	b2sums = 1506901352ea84b8016080aa81a0f431b8620c64c0c54364ec56d1878b6413ad965c2d9f39a9bb06d2356c206702283400918b4fb0fa3dac380360f54e60b146
+	sha256sums = 3110e09266e2830084b7f325a4911acc7812f5f5ddc10bc42a38f1a3ee8e7305
+	b2sums = d87c98d29f9a29568a818bdbaf12a690ff60e16bb4b8f2a97c83280692533d04b089d015dca5b20fd0a03ca3763ef4a3b438f7105cbe877fda6044cc2c462a08
 	b2sums = SKIP
 	b2sums = e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7
 	b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34
-	b2sums = 4ac97b908afb915911212686e41c09137bfa909023dc6fa0808cb6cb12f2dcef9597f0d679c98ad1a6b110d11a92025435cd30dd7b87194428b693c555e2bae7
-	b2sums = 8a22ba0ff1263dd68d3506c300d81da9d32660a575bd5af1e315f7303e21bcfce42b4e60d09f5f9e1d4104d99e53c2ad097ef3a4a37c552b85cd717114413b4f
+	b2sums = 29635d36533cbe8b606b75dc448e1870c12e7519494c67b13030fbe3cba3cce01415b30bb6b9f2d945c8f2966310e805ca0be7254896502eb14b424b28374033
 
 pkgname = firefox-vaapi
diff --git a/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch b/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
deleted file mode 100644
index 3a7118ec69ca..000000000000
--- a/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: ahochheiden <ahochheiden@mozilla.com>
-Date: Sat, 6 May 2023 21:07:09 +0000
-Subject: [PATCH] Bug 1831691 - Use the vendored 'glean_parser' for all of
- `mach` r=firefox-build-system-reviewers,glandium
-
-Differential Revision: https://phabricator.services.mozilla.com/D177340
----
- python/sites/build.txt       | 1 -
- python/sites/mach.txt        | 1 +
- python/sites/python-test.txt | 1 -
- 3 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/python/sites/build.txt b/python/sites/build.txt
-index b43f7680d200..4e6f6c51d9ad 100644
---- a/python/sites/build.txt
-+++ b/python/sites/build.txt
-@@ -1,2 +1 @@
--vendored:third_party/python/glean_parser
- pth:third_party/python/vsdownload
-diff --git a/python/sites/mach.txt b/python/sites/mach.txt
-index b9fafd0b9c59..a18691184312 100644
---- a/python/sites/mach.txt
-+++ b/python/sites/mach.txt
-@@ -78,6 +78,7 @@ vendored:third_party/python/esprima
- vendored:third_party/python/fluent.migrate
- vendored:third_party/python/fluent.syntax
- vendored:third_party/python/giturlparse
-+vendored:third_party/python/glean_parser
- vendored:third_party/python/gyp/pylib
- vendored:third_party/python/idna
- vendored:third_party/python/importlib_metadata
-diff --git a/python/sites/python-test.txt b/python/sites/python-test.txt
-index 48cdcd2b8f48..74889365a22b 100644
---- a/python/sites/python-test.txt
-+++ b/python/sites/python-test.txt
-@@ -1,2 +1 @@
--vendored:third_party/python/glean_parser
- pypi:pytest==7.0.1
diff --git a/0002-enable-vaapi.patch b/0001-enable-vaapi.patch
index dbe92bc2e21a..e91f37690962 100644
--- a/0002-enable-vaapi.patch
+++ b/0001-enable-vaapi.patch
@@ -1,9 +1,9 @@
-diff -up firefox-112.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi firefox-112.0/widget/gtk/GfxInfo.cpp
---- firefox-112.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi	2023-04-05 11:10:14.156695694 +0200
-+++ firefox-112.0/widget/gtk/GfxInfo.cpp	2023-04-05 11:11:40.697665718 +0200
-@@ -810,14 +810,6 @@ const nsTArray<GfxDriverInfo>& GfxInfo::
+diff -up firefox-113.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi firefox-113.0/widget/gtk/GfxInfo.cpp
+--- firefox-113.0/widget/gtk/GfxInfo.cpp.firefox-enable-vaapi	2023-05-09 19:43:38.495868810 +0200
++++ firefox-113.0/widget/gtk/GfxInfo.cpp	2023-05-09 19:44:30.943597984 +0200
+@@ -818,14 +818,6 @@ const nsTArray<GfxDriverInfo>& GfxInfo::
          nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED,
-         V(0, 0, 0, 0), "FEATURE_HARDWARE_VIDEO_DECODING_NO_LINUX_AMD", "");
+         V(0, 0, 0, 0), "FEATURE_HARDWARE_VIDEO_DECODING_NO_R600", "");
  
 -    // Disable on Release/late Beta
 -#if !defined(EARLY_BETA_OR_EARLIER)
diff --git a/PKGBUILD b/PKGBUILD
index c41553227c81..11318f9b1453 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=firefox-vaapi
 _pkgname=firefox
-pkgver=113.0
+pkgver=113.0.1
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org (with VA-API patches)"
 url="https://www.mozilla.org/firefox/"
@@ -70,24 +70,21 @@ source=(
   https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
   $_pkgname.desktop
   identity-icons-brand.svg
-  0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
-  0002-enable-vaapi.patch
+  0001-enable-vaapi.patch
 )
 validpgpkeys=(
   '14F26682D0916CDD81E37B6D61B7B526D98F0353'  # Mozilla Software Releases <release@mozilla.com>
 )
-sha256sums=('7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627'
+sha256sums=('c4f86ecbb3f418cf8f0000a3824c0decb6ef2253f468cf6e005c5fd1de33da4d'
             'SKIP'
             '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
-            '1976c0c5e98b0f67e83de778a4fd7729de9b140efa47b77b5879ea2e907987e9'
-            'b1298c8e9dbaa3a9af04538a80f4c592394fe702c9a4380f8ff71b1795194667')
-b2sums=('1506901352ea84b8016080aa81a0f431b8620c64c0c54364ec56d1878b6413ad965c2d9f39a9bb06d2356c206702283400918b4fb0fa3dac380360f54e60b146'
+            '3110e09266e2830084b7f325a4911acc7812f5f5ddc10bc42a38f1a3ee8e7305')
+b2sums=('d87c98d29f9a29568a818bdbaf12a690ff60e16bb4b8f2a97c83280692533d04b089d015dca5b20fd0a03ca3763ef4a3b438f7105cbe877fda6044cc2c462a08'
         'SKIP'
         'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7'
         '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
-        '4ac97b908afb915911212686e41c09137bfa909023dc6fa0808cb6cb12f2dcef9597f0d679c98ad1a6b110d11a92025435cd30dd7b87194428b693c555e2bae7'
-        '8a22ba0ff1263dd68d3506c300d81da9d32660a575bd5af1e315f7303e21bcfce42b4e60d09f5f9e1d4104d99e53c2ad097ef3a4a37c552b85cd717114413b4f')
+        '29635d36533cbe8b606b75dc448e1870c12e7519494c67b13030fbe3cba3cce01415b30bb6b9f2d945c8f2966310e805ca0be7254896502eb14b424b28374033')
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
@@ -105,13 +102,10 @@ prepare() {
   mkdir mozbuild
   cd firefox-$pkgver
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1831691
-  patch -Np1 -i ../0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
-
   # https://bugzilla.mozilla.org/show_bug.cgi?id=1809068
   # https://bbs.archlinux.org/viewtopic.php?id=281398
   # https://src.fedoraproject.org/rpms/firefox/blob/rawhide/f/firefox-enable-vaapi.patch
-  patch -Np1 -i ../0002-enable-vaapi.patch
+  patch -Np1 -i ../0001-enable-vaapi.patch
 
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key