Date: Friday, May 12, 2023 @ 13:59:25 Author: heftig Revision: 477641
113.0.1-1 Modified: firefox/trunk/PKGBUILD firefox/trunk/keys/pgp/14F26682D0916CDD81E37B6D61B7B526D98F0353.asc Deleted: firefox/trunk/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch -----------------------------------------------------------------+ 0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch | 39 ---------- PKGBUILD | 16 +--- keys/pgp/14F26682D0916CDD81E37B6D61B7B526D98F0353.asc | 39 +++++++++- 3 files changed, 42 insertions(+), 52 deletions(-) Deleted: 0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch =================================================================== --- 0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch 2023-05-12 13:07:05 UTC (rev 477640) +++ 0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch 2023-05-12 13:59:25 UTC (rev 477641) @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: ahochheiden <[email protected]> -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 Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-05-12 13:07:05 UTC (rev 477640) +++ PKGBUILD 2023-05-12 13:59:25 UTC (rev 477641) @@ -3,7 +3,7 @@ # Contributor: Jakub Schmidtke <[email protected]> pkgname=firefox -pkgver=113.0 +pkgver=113.0.1 pkgrel=1 pkgdesc="Standalone web browser from mozilla.org" url="https://www.mozilla.org/firefox/"; @@ -66,21 +66,18 @@ 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 ) validpgpkeys=( '14F26682D0916CDD81E37B6D61B7B526D98F0353' # Mozilla Software Releases <[email protected]> ) -sha256sums=('7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627' +sha256sums=('c4f86ecbb3f418cf8f0000a3824c0decb6ef2253f468cf6e005c5fd1de33da4d' 'SKIP' '298eae9de76ec53182f38d5c549d0379569916eebf62149f9d7f4a7edef36abf' - 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9' - '1976c0c5e98b0f67e83de778a4fd7729de9b140efa47b77b5879ea2e907987e9') -b2sums=('1506901352ea84b8016080aa81a0f431b8620c64c0c54364ec56d1878b6413ad965c2d9f39a9bb06d2356c206702283400918b4fb0fa3dac380360f54e60b146' + 'a9b8b4a0a1f4a7b4af77d5fc70c2686d624038909263c795ecc81e0aec7711e9') +b2sums=('d87c98d29f9a29568a818bdbaf12a690ff60e16bb4b8f2a97c83280692533d04b089d015dca5b20fd0a03ca3763ef4a3b438f7105cbe877fda6044cc2c462a08' 'SKIP' 'e18f2c22e394ca3b6758bc130245b254947e4d15921be3da443d6d7c3c4b0d22ead1b39fbc10a4f896edd19e2a1dffbd1cbb34dc4beb0621a6ddb70ccc53b3a7' - '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34' - '4ac97b908afb915911212686e41c09137bfa909023dc6fa0808cb6cb12f2dcef9597f0d679c98ad1a6b110d11a92025435cd30dd7b87194428b693c555e2bae7') + '63a8dd9d8910f9efb353bed452d8b4b2a2da435857ccee083fc0c557f8c4c1339ca593b463db320f70387a1b63f1a79e709e9d12c69520993e26d85a3d742e34') # 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 @@ -98,9 +95,6 @@ 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 - echo -n "$_google_api_key" >google-api-key echo -n "$_mozilla_api_key" >mozilla-api-key Modified: keys/pgp/14F26682D0916CDD81E37B6D61B7B526D98F0353.asc =================================================================== --- keys/pgp/14F26682D0916CDD81E37B6D61B7B526D98F0353.asc 2023-05-12 13:07:05 UTC (rev 477640) +++ keys/pgp/14F26682D0916CDD81E37B6D61B7B526D98F0353.asc 2023-05-12 13:59:25 UTC (rev 477641) @@ -58,6 +58,41 @@ 3e4UhkENvup4AQL8eE9SB7RYD6nzWgOPZvG92gKKxqOgW85sIeF6/uwzNn0rJAbJ BnSD2YAOFcruPzwuWgk8ndDapQYI/4O10UDBrxUZHZxCHFWW78Xc5+I9enUvuN3V MxTCyk4UW5FGrp2mKGTyGLoqm8AqBV+7yXYATGk8WH5ApXOSyUla/l/vUWDcJTp+ -JIkMyrLVbZf6n6Q6MOkLBpgPSe7/FbfSRINOdkRHGWZg -=/ReQ +JIkMyrLVbZf6n6Q6MOkLBpgPSe7/FbfSRINOdkRHGWZguQINBGRVQHMBEADVwPef +m57SwJxmapfYVu0gVGyTf2uUaS+7FgAGxYFPOvRFtFbuHjpXNZs5xTlmZsmun9uG +CRJhFHd2ubNPrfJRnrZ2fDDp7ksmMZK3X3PNxt6v0EcQuOoqp8B8s2y5ntlDmnvx +zq6ImF7xaltaiBuynEnbR26tosaYrgqXbd9re0XQaeDVEuGgVxJUr9a0NnIL56U8 +qlyHVKu7qzD+vyS1+6E0hEbF1uP+UUc1U7MJdvcxMCqkjKc0YyhwUWepYtku0i2m +EfE9SpWvosq9zeLdoyULoi8s2DQ27w7TzweDcCH21GZco6yEuNiM95eoz152qhZa +qnPENM2XomUUzA/45pwwqzJftar5lcL+jfKAL+hyVhQq2K6gaDjt9II3YZLdXYZf +bMWVPpIS8RBBvaDnIhItf1D+D0DIl2q19ot7gW/q8zg/XGE5QOeOZ2i6WbcUaQLv +TVkXt4WExJFQz1CGQYfpjPZO9LiG3paGDtpW3gSsigl+P2PMk6nqT2+drkuaCSPy +XX01OJRDuCT3wffBbiZGsg3FnbJAPjtX8sn61RqYlzlpz4jRU/tzXnGYoQnat8YI +aGJJZDBlnDtjb+qgANIGUjbxGUFO5E/aLoB3DIlT7vkLPEbMymv/AEuFlP581FXg +cd3l2BHdjFqOmTNnrBcvZpomHOcUSYsEuiQ7AwARAQABiQRyBBgBCgAmFiEEFPJm +gtCRbN2B43ttYbe1JtmPA1MFAmRVQHMCGwIFCQPCZwACQAkQYbe1JtmPA1PBdCAE +GQEKAB0WIQSt1weUeXANyt/dUzfjbTsT89kydAUCZFVAcwAKCRDjbTsT89kydGB2 +D/4sCFrxWHVIhWlfNQdV3HzWQ/LEFJpe061sHDq70SI9b7EJSIX+nKfsfWW76ECh +140UAOxeaY40pwGNRFV/A7zWzrSAspgFfGlwstBet804utgyeiSvkV+4jfNnQChK +cShL25+d//uymNtrxGV1XWraSt3DUq1uIurcPy/gTepF/HlKoID54lJq9oCHdoGL +qW9GVRJmbPxFbCrqA/1ngGJNPIWnmNC/Vkolvk4n7jgDSlL5G8YNGr9sABRBQssg +lU6GJMzvixv8E+Z5FhRL7557XQgVbhuysomicKhJBNdB7E6kfoAAVd5kNqQl/KNP +GeXf4C0DhUSnVQkibRjB7SHqVPSKxIk9WndEVlE+OrSD79WeIGy9iEsT/vSmH0iZ +Tgdd026ZlWpeprCYgNHC/s1tiOlDxCfNw/e8nldDj9s1T/FZ3V4zaB2ltcj0HjoR +Ht9BwglE2trBsRt/O4fLmcg0DOvOeyD58ALvrDY6aufnjtCJjZ7LuPLuTv22UJcZ +dYC32KSQn3kEIuw67k5PE+Lj9RRLZ6fXINvHl6PseHv2gRnHO5tbX6/k7X61eAw5 +Z3pmBfCq6rnS+z5fiaLsEoTZvUyLpmrZj4rDt0ARthjOGxID5JE+7m+smAtM1CYb +HFutID6UJS9Dx0/LBfPTS8qJDAj25Gq0rQtfUEu4coiGDg6DEACeYVJmC7vAiwTa +QFjBpsJIgUlnMe7SWC1HJitjxeHs+D5X2yUiIwYbhIjKrl5R+ZTxteNzi9CQToof +GxtvM3qAVUtfUoOPFEqH7+cb9EO1/D+JzuKJdl+CQSrMhWAiu2UNv8MrpkMx4AGc +lxllMkwALiVakkaCadnF8Agaa1xQ4DQIoZPjey7JgRPsvsdd3RMz5wlGdsRvubw5 +7FP1eqrB7N+qiLUwYfaDyVEpAThnZ4QW8KK4mcLDnjvC2klYRCsbDV6ovcBLxjTn +VipuVtctuB/k5rj3KjrfR6Gr07Ggt3v4Z1bBgGWv/QTM9RZ7OF0goq+HVE74VAYC +XNgno+rsE/C+7d0Ldhh03cDH/x2PnTfpj6YeAOyeaVSTx2XOInQ7eHV+R79bzUAH +HgBIGS1cB/UjB5FtvGpbw6AyEbrEdN6ISONq/tKaUPRdU7GOEj6oGg0+i9aUKGo4 +3FpuUGS6HQl3qR02JpIQz1x3rSQrcZP90EzK/TJWGEtyLodBn4x/hxufQq1rLO5A +s5x1EI3cUX8k1Afe/osDUx1F+YmWALhR2J6kFvW4KC1Ug+LNG5dYOPKPN49lE38C +ppRsSg0EeEjPScqFAYNuy3i6AjMlYhf7pSiTA8LeO8mpBC21xyMDLqRcGbF/HJEw +HkER4tjT6pU/K87GlcQaeVIdiZ0hLg== +=7ceB -----END PGP PUBLIC KEY BLOCK-----
