libre/iceweasel: update to 107.0.1, sync with upstream, cleanup

1 files changed, 124 insertions, 44 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 3ccad910f..24d34f236 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -70,53 +70,119 @@
 
 pkgname=iceweasel
 epoch=1
-pkgver=107.0
+pkgver=107.0.1
 pkgrel=1
 pkgrel+=.parabola1
 _brandingver=102.0-1
 pkgdesc="Standalone web browser derived from Mozilla Firefox"
-arch=(x86_64)
-arch+=(armv7h i686)
-license=(MPL GPL LGPL)
 url=https://wiki.parabola.nu/Iceweasel
-depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)
-makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
-             autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python
-             lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi
-             )
-makedepends+=(python-setuptools python-zstandard python-typing-extensions
-              quilt libxslt imagemagick git jq python-jsonschema)
-optdepends=('networkmanager: Location detection via available WiFi networks'
-            'libnotify: Notification integration'
-            'pulseaudio: Audio support'
-            'speech-dispatcher: Text-to-Speech'
-            'hunspell-en_US: Spell checking, American English'
-            'xdg-desktop-portal: Screensharing with Wayland')
+arch=(x86_64)
+arch+=(
+  armv7h
+  i686)
+license=(
+  GPL
+  LGPL
+  MPL
+)
+depends=(
+  dbus-glib
+  ffmpeg
+  gtk3
+  libpulse
+  libxt
+  mime-types
+  nss
+  ttf-font
+)
+makedepends=(
+  cbindgen
+  clang
+  diffutils
+  dump_syms
+  imake
+  inetutils
+  jack
+  lld
+  llvm
+  mesa
+  nasm
+  nodejs
+  python
+  rust
+  unzip
+  wasi-compiler-rt
+  wasi-libc
+  wasi-libc++
+  wasi-libc++abi
+  xorg-server-xvfb
+  yasm
+  zip
+)
+makedepends+=(
+  git
+  imagemagick
+  jq
+  libxslt
+  python-jsonschema
+  python-setuptools
+  python-typing-extensions
+  python-zstandard
+  quilt
+)
+optdepends=(
+  'hunspell-en_US: Spell checking, American English'
+  'libnotify: Notification integration'
+  'networkmanager: Location detection via available WiFi networks'
+  'pulseaudio: Audio support'
+  'speech-dispatcher: Text-to-Speech'
+  'xdg-desktop-portal: Screensharing with Wayland'
+)
 # provides=('firefox') # TODO: redmine #2164 - currently conflicts with 'your-freedom'
 replaces=('firefox')
-options=(!emptydirs !makeflags !strip !lto !debug)
-source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
-        0001-libwebrtc-screen-cast-sync.patch
-        $pkgname.desktop identity-icons-brand.svg)
+options=(
+  !debug
+  !emptydirs
+  !lto
+  !makeflags
+  !strip
+)
+source=(
+  https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc}
+  $pkgname.desktop
+  identity-icons-brand.svg
+  0001-libwebrtc-screen-cast-sync.patch
+)
 source=(${source[*]/identity-icons-brand.svg/})
-source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig}
-         9001-FSDG-sync-remote-settings-with-local-dump.patch
-         9002-FSDG-preference-defaults.patch
-         9003-FSDG-urihandlers.patch
-         9004-FSDG-misc.patch
-         process-json-files.py
-         vendor.js.in
-         zstandard-0.19.0.diff)
+source+=(
+  https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.branding.tar.xz{,.sig}
+  9001-FSDG-sync-remote-settings-with-local-dump.patch
+  9002-FSDG-preference-defaults.patch
+  9003-FSDG-urihandlers.patch
+  9004-FSDG-misc.patch
+  process-json-files.py
+  vendor.js.in
+  zstandard-0.19.0.diff
+)
 source_armv7h=(build-arm-libopus.patch)
-source_i686=(avoid-libxul-OOM-python-check.patch
-             rust-static-disable-network-test-on-static-libraries.patch
-             firefox-106.0.1-fdlibm.patch
-             simd_avx2.patch
-             fix-i686-build-moz-1792159.patch)
-sha256sums=('8a562e5a397b57e9bf383c2988308ab494c5d28844e792c658fedea27756584a'
+source_i686=(
+  avoid-libxul-OOM-python-check.patch
+  rust-static-disable-network-test-on-static-libraries.patch
+  firefox-106.0.1-fdlibm.patch
+  simd_avx2.patch
+  fix-i686-build-moz-1792159.patch
+)
+validpgpkeys=(
+  '14F26682D0916CDD81E37B6D61B7B526D98F0353'  # Mozilla Software Releases <release@mozilla.com>
+)
+validpgpkeys+=(
+  'BFA8008A8265677063B11BF47171986E4B745536' # Andreas Grapentin
+  '3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40' # bill-auger
+)
+sha256sums=('e29950b9ba9143b0d683dc18779bbe70bbd082533aff8f6a7af69b19533e0647'
             'SKIP'
-            '5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286'
-            '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')
+            '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58'
+            '5c164f6dfdf2d97f3f317e417aaa2e6ae46a9b3a160c3162d5073fe39d203286')
 sha256sums+=('d29c194ed7b3b4fa0f511866723118938c2be40077b4e9aadf8b3e6bfff91049'
              'SKIP'
              '77cfa1e135ba6884ee343468075491b67fe148077e4aebe8bb5ff7b5f6e022c2'
@@ -132,9 +198,27 @@ sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e3
                  'ddc0945f2414828668dd922b6b8203f7fb54d7b1f0aac3e18299bccb5c2facab'
                  'e68f8a9858f14a75813df608510e1f8143fd6eb1fcf233df8239d16d935e80f8'
                  '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06')
-validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com>
-validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
-validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
+b2sums=('cab3d7e723c9927518a3acfbf8d0db7846074000933074309b9bea1dcc2e182b579a7a6b2763bafeaf813d9846c4539d6e73cf75734844f3207525aff7e5c8be'
+        'SKIP'
+        'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635'
+        '28a22a11572fba86bf8412f86a2eca8dc34ce42e790d9c9b1e0b1a66959b2b0240353e0aef22741d6d2baa08bc7ff35ddfd3770b706654ffa8089a26495e4ee3')
+b2sums+=('c2a2ead1b44c563583abb5cd3579e8f2724ea79e12aba1b315f201a09547d611b4a3c98de12f063b25826fd1520562d411ab917780bab4d78a1240fe56096b1b'
+         'SKIP'
+         'fc681f1abbcdb669e60f7d40a43749f16e0693e18b790c259367f64212a28981246e01cbf269b6b9c05e9ea3a9fcb4fb7ee35340769676f3051da5585982ae5d'
+         '2eaacb9fb15391557a36cae10ec6d70b5a4ab6f71c4b24d268f5c0df78b272f0d88c9c7498ae92c60f1436dff82dc8c49e94b0a535535329a2419302aee7b7a8'
+         '48b23fcf1e5fe3e8e0d2f85e1e43c79700449838d39a962110d30f5f7acdefcd1db6f80ccade2ab1eb7e26e5651cbfb37d8358d7f87f9e820d4a395cce8b0454'
+         '42e08d0872dffa94ec73d29c08b60ce4d966be2f785e07a01ec3ef2ac05bbe895675655b60e85f9c705878291df7ead69e7ef9d7bce8c95a47b6a124231f889c'
+         '2a746251ffdbe91bc8933c798242a32dfda7f9621d26924a752e5fa9b5f97a1b8cd83fbb0e9063d62fc36e08f8222371ac7873202c2ce5f8498c12024b4ccdc4'
+         '5f0bb717734f94594e146d72a95e65bf631716affca84c5cdd1d3777f2c9ddd1a9ec243c806f7a846a5cfcaa5793d8f84b0e0720d4f868ae6368857a69506427'
+         '1b8ace4e8fc6ebc99d527c33781182218c4b8c640914cc8e800616a1e370cb1ea6da890bcf45fb753a4594513755585290141fe9c12fbc039c00f56ade6cf0c4'
+         'dfce473a5492e79faf9120ff4026861623cfb89d39046f96ea52ef83e01d1288ec0bf46b5bde4a68b24c9562493e66028621555f69a783e5f89cb2d0897bb4aa')
+b2sums_armv7h=('6e5980e56343a23bce4fcda58f6abc8f2debca0c278c87b09e53abb17ff15849c26e8df3bbff2388985f8fe5a4e9be9982c602ef7159546f0ae335fca1000a41')
+b2sums_i686=('97035e44cd1deae7bb2422c81eec7294feb51f43f460b4d7ddba083e1d8a48d265a36ca43cf1d9dee49b01ee6df0c76e0f6916cc73cb7ad9caa1c235a59da0e4'
+             '009789d3bb93ba418929019135804fc3de7de161e5be8efba7fc75646fbde395720be5b7a7d3f5d1671f459fdd2944dd14aca306bbf1c975436d4f7765d62d15'
+             '4492e991d25c0603b8deb25484d891c1bfc70ec71dc63a76eb56189873a66a508a00a7f98edc295da18e017909a4591863e820c2041beea0c00724687f25867d'
+             '611454f7943cce37acee31234d887d9e58e3d1f4745e811968e42aea8ec5d655f0081a594a233e663db17c95b264083891562e12f098ac261d57a0ae1c3c1c3d'
+             'd20ce3eff595f85df86eaa0dfb665fc356f8987117a771f76adc4ac12046a7e82b0af182fa99f87ea1362a5026c9d0216c7b714649fef0c7294c61c8e8f4d790')
+
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)  # anti-feature
 # Note: These are for Arch Linux use ONLY. For your own distribution, please # anti-feature
@@ -154,10 +238,6 @@ validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
 # disable PGO for 32-bit arches
 _should_skip_pgo=0 # for x86_64 (try '1' if the build hangs indefinitely)
 
-makedepends+=( ${makedepends[*]/python-zstandard/python-zstandard=0.18.0} )
-
-makedepends+=( python-pydantic=1.9.2 ) # dustbin - configure error: "pydantic 1.10.2 has requirement typing-extensions>=4.1.0, but you have typing-extensions 3.10.0.0. - ('typing-extensions' is vendored; but 'python-pydantic' is not)"
-
 case "${CARCH}" in
 armv7h)
   _should_skip_pgo=1