114.0a1+20230506.2+hca770a49d132-1: Unbreak build

3 files changed, 52 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6130da17b8ef..555d0190854b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-nightly
 	pkgdesc = Development version of the popular Firefox web browser
-	pkgver = 114.0a1+20230421.1+hdf954b717c6c
+	pkgver = 114.0a1+20230506.2+hca770a49d132
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/channel/#nightly
 	arch = x86_64
@@ -53,14 +53,17 @@ pkgbase = firefox-nightly
 	source = firefox-nightly.desktop
 	source = identity-icons-brand.svg
 	source = firefox-install-dir.patch
+	source = 0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	sha256sums = SKIP
 	sha256sums = 7d90a9abacb5cc9870a31323ef31e361f620538c56609001d6d9e789b99b5e97
 	sha256sums = a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9
 	sha256sums = c80937969086550237b0e89a02330d438ce17c3764e43cc5d030cb21c2abce5f
+	sha256sums = ac22441b4e10c3ae2071e91853948414763849ad43587de207462293f6b0db42
 	b2sums = SKIP
 	b2sums = 3a7c8c5123349ea777ddb8f2f219f6048ce1f213b0a65edaad1fab42380be4e7b5cd27e4667f43786efeb13be827174936c3282607276f167b6eee0fd530af2a
 	b2sums = 63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34
 	b2sums = f76eb72c326f347991133c004b252ed2e037e72a7a436012fb1495668d2b9194d836765b58b01ba0bd9f5c4b888ee5ee715bdb458823a2a7822f1b299f4d1948
+	b2sums = 660aabc8f26b356a48863b070d4cf9569afa1c0b7565c0924699435f4d10a94310233742f8ee0f4f96ba7b93b59615d278d734a07c50267835dbf4cca0301d29
 
 pkgname = firefox-nightly
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
new file mode 100644
index 000000000000..8698b37f680b
--- /dev/null
+++ b/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: ahochheiden <ahochheiden@mozilla.com>
+Date: Sat, 6 May 2023 02:39:47 +0200
+Subject: [PATCH] Bug 1831691 - Use the vendored 'glean_parser' for all of
+ `mach` r?#build
+
+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 753a5e2c1fb0..b9cac0ca83b8 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/PKGBUILD b/PKGBUILD
index 4694bd348f89..d0e9ec9fd996 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox-nightly
-pkgver=114.0a1+20230421.1+hdf954b717c6c
+pkgver=114.0a1+20230506.2+hca770a49d132
 pkgrel=1
 pkgdesc="Development version of the popular Firefox web browser"
 url="https://www.mozilla.org/firefox/channel/#nightly"
@@ -69,6 +69,7 @@ source=(
   $pkgname.desktop
   identity-icons-brand.svg
   firefox-install-dir.patch
+  0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
 )
 validpgpkeys=(
   '14F26682D0916CDD81E37B6D61B7B526D98F0353'  # Mozilla Software Releases <release@mozilla.com>
@@ -76,11 +77,13 @@ validpgpkeys=(
 sha256sums=('SKIP'
             '7d90a9abacb5cc9870a31323ef31e361f620538c56609001d6d9e789b99b5e97'
             'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9'
-            'c80937969086550237b0e89a02330d438ce17c3764e43cc5d030cb21c2abce5f')
+            'c80937969086550237b0e89a02330d438ce17c3764e43cc5d030cb21c2abce5f'
+            'ac22441b4e10c3ae2071e91853948414763849ad43587de207462293f6b0db42')
 b2sums=('SKIP'
         '3a7c8c5123349ea777ddb8f2f219f6048ce1f213b0a65edaad1fab42380be4e7b5cd27e4667f43786efeb13be827174936c3282607276f167b6eee0fd530af2a'
         '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34'
-        'f76eb72c326f347991133c004b252ed2e037e72a7a436012fb1495668d2b9194d836765b58b01ba0bd9f5c4b888ee5ee715bdb458823a2a7822f1b299f4d1948')
+        'f76eb72c326f347991133c004b252ed2e037e72a7a436012fb1495668d2b9194d836765b58b01ba0bd9f5c4b888ee5ee715bdb458823a2a7822f1b299f4d1948'
+        '660aabc8f26b356a48863b070d4cf9569afa1c0b7565c0924699435f4d10a94310233742f8ee0f4f96ba7b93b59615d278d734a07c50267835dbf4cca0301d29')
 
 # 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
@@ -122,6 +125,9 @@ prepare() {
   # Change install dir from 'firefox' to 'firefox-nightly'
   patch -Np1 -i ../firefox-install-dir.patch
 
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1831691
+  patch -Np1 -i ../0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
+
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key