[iceweasel]: build with python 3.10, to support python-pydantic 1.9.2

NOTE: if that python-pydantic problem continues,
we may need to package python-pydantic 1.9.2, built against the latest python

2 files changed, 3 insertions, 46 deletions

diff --git a/libre/iceweasel/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch b/libre/iceweasel/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
deleted file mode 100644
index 3a7118ec6..000000000
--- a/libre/iceweasel/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/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 4270eb902..1ff1c6eba 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -152,9 +152,7 @@ options=(
 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
-)
+  identity-icons-brand.svg)
 source=(${source[*]/identity-icons-brand.svg/}) # branding over-ride
 source+=(
   https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig}
@@ -182,8 +180,7 @@ validpgpkeys+=(
 )
 sha256sums=('7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627'
             'SKIP'
-            '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58'
-            '1976c0c5e98b0f67e83de778a4fd7729de9b140efa47b77b5879ea2e907987e9')
+            '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')
 sha256sums+=('a44dc1e9f2d508203d1cacc2b5bb212c73eb04311da9a036560ff389d7b8e9e6'
              'SKIP'
              '63245fa00363d8884aa2b62fbade557cbe72c5cb326303c7d3f7664e0e3e359c'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
@@ -249,6 +246,7 @@ readonly _SHOULD_USE_GCC==$(case "${CARCH}" in armv7h) echo 1 ;;
 
 makedepends+=( python-pydantic=1.9.2   ) # dustbin - configure error: pydantic 1.10.4 has requirement typing-extensions>=4.2.0, but you have typing-extensions 3.10.0.0
 makedepends+=( python-zstandard=0.19.0 ) # dustbin - configure error: zstandard<=0.19.0,>=0.11.1: Installed with unexpected version "0.20.0"
+makedepends+=( python=3.10.10          ) # dustbin - to support 'python-pydantic' above
 
 case "${CARCH}" in
 armv7h)
@@ -341,8 +339,6 @@ prepare() {
 
 
   ## technical patching ##
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1831691
-  patch -Np1 -i ../0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
 
   # arch-specific technical patching
   case ${CARCH} in