[iceweasel]: upgrade to v114.0

1. Update according to the changes from upstreams.
2. To build, needed to copy 'document.ico' from 'unofficial' branding
   folder. I believe it has no trademarks attached to it and is OK for
Parabola as it appears to have no special license notice, meaning it's
MPL-2.0 as is most of the Firefox code. Ideally, it'd be better to
remove the wireframe sphere logo from the center and replace it with
Iceweasel logo, and that's what I did initially. But after some digging
into license compatibility of MPL-2.0 and multi-license of Iceweasel
logo (MPL 1.1/GPL 2.0/LGPL 2.1), and reading recommendations to consult
with a lawyer for this case (combining modified works), I decided that's
too much of a hassle.
2. FSDG: Disable and remove URLs of Contile and autoupdate of system
   addons.
3. Remove dependencies to old versions of python and python-pydantic,
   since system python-typing-extensions can be used instead of vendored
one (after removal of it from the source tree in prepare()).
4. Bring back the patch for version constraint of python-zstandard to
   depend on current system version.

1 files changed, 32 insertions, 23 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index e4aa8973b..ecc4fbc1e 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -70,7 +70,7 @@
 
 pkgname=iceweasel
 epoch=1
-pkgver=113.0.2
+pkgver=114.0
 pkgrel=1
 pkgrel+=.parabola1
 _brandingver=112.0
@@ -162,6 +162,7 @@ source+=(
   9004-FSDG-misc.patch
   process-json-files.py
   vendor.js.in
+  zstandard-0.21.0.diff
 )
 source_armv7h=(build-arm-libopus.patch)
 source_i686=(
@@ -178,34 +179,36 @@ validpgpkeys+=(
   'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin
   '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger
 )
-sha256sums=('f132b702836311b6cc40873b69df3ce208d035dbc8ce390c390eebd63d27c7a3'
+sha256sums=('d23a0502742f52110ce496837ba82b47bf38d40585633787508ae5be9a5b4bc6'
             'SKIP'
             '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')
 sha256sums+=('a44dc1e9f2d508203d1cacc2b5bb212c73eb04311da9a036560ff389d7b8e9e6'
              'SKIP'
-             '63245fa00363d8884aa2b62fbade557cbe72c5cb326303c7d3f7664e0e3e359c'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
-             '1e4d28bd87688334b20cce9213490111e004ea6bcf1654f550da8ebe6bdbf3ef'  # 9002-FSDG-preference-defaults.patch
+             '5c698551b1170e4bbf6e079c82ff0ccdc5266d87678b0653623dea5ec124d09a'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
+             '131acdeff2af06c07f245717cd7cb898291f4466136f441b7b90acb2ccdade0a'  # 9002-FSDG-preference-defaults.patch
              '13b701372b6fb35b96a1d58853db64643feb9be061ebc461b41ceca5de8eea62'  # 9003-FSDG-urihandlers.patch
-             '44eeea69361ee4b9e4814452ed7e59f1caf2280688316dfdfe3e8b0f5da35798'  # 9004-FSDG-misc.patch
+             'f2775f40dec9849b318f290c91f34c608ebbe274044fec9b05a485536e7041c0'  # 9004-FSDG-misc.patch
              '00cb44a91b42942f17258ad165810866ff123777b667a5691ea0745ba72f4332'  # process-json-files.py
-             '8e113fd2730be3fd11b2a24918dd62e8741513cf4dce9819d8eae358c5411adc') # vendor.js.in
+             '8e113fd2730be3fd11b2a24918dd62e8741513cf4dce9819d8eae358c5411adc'  # vendor.js.in
+             'aa663d899e924f4979114584cad671dad3b93dd9b0dfe28bb1cf11ddf92e6d47') # zstandard-0.21.0.diff
 sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353'
                  '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041'
                  'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1'
                  '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06'
                  'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544')
-b2sums=('29be5865db0fd5de0d74d8f906301277eb3eeb0ef53db0a27398a0410fd2b8f973074cf58e00c718b5c7ef2b71295513adc1a905444e8b74f5b9be3a701d9b6d'
+b2sums=('09d29112a487bc23c0e54380bf5e6ef5c62639aa53b6cca7c9a61b2452f4ee0e1a1b9f7ca996ddb78b842170fa67be0dc926c17956ab505e42966d443a798f34'
         'SKIP'
         'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635')
 b2sums+=('8472a10e5e27cc82f1467dd6592dfee512cd165e39f23ebbb4c8e76bbf6fd8614a4c1f1d91d42046f773eb711f463ece1aa23e1b1882173290529c28b0f3b60a'
          'SKIP'
-         'ba9530d65871a84fdfd121c2ee13ce9f80d65e1f7cd23be7ea9fc232822601c9f7428c15e08e971f0d24791d93290945ecee55de99e6c2b64f8cdc6d2806b564'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
-         'bdb08d681f6f17ae9f8e0bb37e23087a0401d4be26c91ead3eda4654362ad37c3b1cddf69596e2b2278f77e0fd45714b7dbb7a97aca35aae5417e916079d24bf'  # 9002-FSDG-preference-defaults.patch
+         '9bd51af60740fcbf31b8387901d73c09dbc2f15ddd98d18f4c90ee909f58c9a8fe032712679c36d0c52358dad34c68b539695fccb019b4c35859673a724c3f72'  # 9001-FSDG-sync-remote-settings-with-local-dump.patch
+         'fc2204d183cf8ef133cb94580a92db26356edb069424e751743b2af349f115fb6069f0e3fe860496e05193cb0ca3dcb9aa5869c86d5c96c05a6eaec5242f8a35'  # 9002-FSDG-preference-defaults.patch
          '9e4ccfb8850d9f9a5222f5186b35f2ae7986b6c6d435de024b109a6fa01e65a1362664cfb6ea81621387cf33364cc8d3d466fae1bee24ab5fc7e23c4cb17bf2c'  # 9003-FSDG-urihandlers.patch
-         '82224f03e7688daebed3b70959206d2aa4758212f2982e9847862617a5a4005be29493fcd44066604f421ebec6b8c94dcf0cfbf03d0c3d670f00d5192d2421d7'  # 9004-FSDG-misc.patch
+         '7ce9bd437d2877545f71a2f258b94f4c3e4107dbb65957ea544b2ae915dd2f783ea1473354608097425e5245d76ea51c8993ddeffebd6aeca6e23711415bbf93'  # 9004-FSDG-misc.patch
          '085c4631ec8cfdf5842068d882185c783e976b1fde74167bb71ef4d7db8c70c12844177b17e76f858ba3ce2a402848ac8fc19910dcbefd29887abfaf5faac5e4'  # process-json-files.py
-         '5302b6abcfec3155c578e0664e6a0ac921234c5912d74c4a9b0feb3a051ed4ef5f11b93ee37739a3a92fc6693683374f92ac9c3f560780f879c4249d0718157a') # vendor.js.in
+         '5302b6abcfec3155c578e0664e6a0ac921234c5912d74c4a9b0feb3a051ed4ef5f11b93ee37739a3a92fc6693683374f92ac9c3f560780f879c4249d0718157a'  # vendor.js.in
+         '2e568bb28f23f0f9225ca68a5084e3e835f6bd15046eea9d615d3462146da649c1b6b7439b4d768759bda2658d54ca73c9b3479e5e0b6d7a58822664dbe45aa2') # zstandard-0.21.0.diff
 b2sums_armv7h=('6e5980e56343a23bce4fcda58f6abc8f2debca0c278c87b09e53abb17ff15849c26e8df3bbff2388985f8fe5a4e9be9982c602ef7159546f0ae335fca1000a41')
 b2sums_i686=('97035e44cd1deae7bb2422c81eec7294feb51f43f460b4d7ddba083e1d8a48d265a36ca43cf1d9dee49b01ee6df0c76e0f6916cc73cb7ad9caa1c235a59da0e4'
              '009789d3bb93ba418929019135804fc3de7de161e5be8efba7fc75646fbde395720be5b7a7d3f5d1671f459fdd2944dd14aca306bbf1c975436d4f7765d62d15'
@@ -242,10 +245,6 @@ readonly _SHOULD_USE_GCC=$(case "${CARCH}" in armv7h) echo 1 ;; *) echo 0 ;; esa
 
 ## dependency tweaks ##
 
-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)
   makedepends=( ${makedepends[*]/wasi-*/} ) # armv7h has no wasi compiler
@@ -337,6 +336,15 @@ prepare() {
 
   ## technical patching ##
 
+  # Unbreak build with python-zstandard 0.21.0
+  echo "applying zstandard-0.21.0.diff"
+  patch -Np1 -i ../zstandard-0.21.0.diff
+
+  # Use system python-typing-extensions instead of the old vendored one to avoid
+  # unresolvable dependency versions. They are probably downloaded when network
+  # connectivity is enabled at built time, but that is not the case for Parabola.
+  rm -rfv third_party/python/typing_extensions
+
   # arch-specific technical patching
   case ${CARCH} in
   aarch64|armv7h)
@@ -564,14 +572,15 @@ END
   for size in 16 22 24 32 48 64 128 256
   do  rsvg-convert -w ${size} -h ${size}  iceweasel_icon.svg -o default${size}.png
   done
-  cp                                      iceweasel_logo.svg        content/aboutlogins.svg
-  cp                                      iceweasel_logo.svg        content/about-logo.svg
-#  cp                                      iceweasel_logo.svg        content/about-logo.svg # RuntimeError: File "about-logo.svg" not found in browser/branding/iceweasel/content
-  rsvg-convert -w 192 --keep-aspect-ratio iceweasel_logo.svg     -o content/about-logo.png
-  rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg     -o content/about-logo@2x.png
-  cp                                      content/about-logo.png    content/about-logo-private.png
-  cp                                      content/about-logo@2x.png content/about-logo-private@2x.png
-  echo "${blank_svg}"                                             > content/$pkgname-symbolic.svg # TODO: branding package
+  cp                                      iceweasel_logo.svg         content/aboutlogins.svg
+  cp                                      iceweasel_logo.svg         content/about-logo.svg
+#  cp                                      iceweasel_logo.svg         content/about-logo.svg # RuntimeError: File "about-logo.svg" not found in browser/branding/iceweasel/content
+  rsvg-convert -w 192 --keep-aspect-ratio iceweasel_logo.svg      -o content/about-logo.png
+  rsvg-convert -w 384 --keep-aspect-ratio iceweasel_logo.svg      -o content/about-logo@2x.png
+  cp                                      content/about-logo.png     content/about-logo-private.png
+  cp                                      content/about-logo@2x.png  content/about-logo-private@2x.png
+  echo "${blank_svg}"                                              > content/$pkgname-symbolic.svg # TODO: branding package
+  cp                                      ../unofficial/document.ico document.ico
 
   popd > /dev/null