From 2427904c29e52f4e3c6b249bc228219c0648d1ad Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Oct 27 2022 02:06:25 +0000
Subject: [icecat][iceweasel]: housekeeping


---

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 9636fc2..da04329 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -55,19 +55,10 @@ arch=(armv7h i686 x86_64)
 license=(MPL GPL LGPL)
 url=http://www.gnu.org/software/gnuzilla/
 depends=(gtk3 libxt mime-types dbus-glib ffmpeg nss ttf-font libpulse)
-[[ "${CARCH}" == 'armv7h' ]] && depends+=( icu=71.1 ) # ld.lld: error: undefined hidden symbol: std::type_info::operator==(std::type_info const&) const
 makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
-             autoconf2.13 rust clang llvm jack nodejs cbindgen nasm
-             python-setuptools python-psutil python-zstandard lld dump_syms
-             wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi)
-makedepends+=(jq python-jsonschema)
-makedepends+=( ${makedepends[*]/python-psutil/python-psutil=5.8.0}        ) # |  psutil<=5.8.0,>=5.4.2: Installed with unexpected version "5.9.1"
-makedepends+=( ${makedepends[*]/python-zstandard/python-zstandard=0.17.0} ) # |  zstandard<=0.17.0,>=0.11.1: Installed with unexpected version "0.18.0"
-[[ "${CARCH}" == 'armv7h' ]] && makedepends=( ${makedepends[*]/wasi*/} ) # armv7h has no wasi compiler
-[[ "${CARCH}" == 'i686'   ]] && makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin
-[[ "${CARCH}" == 'i686'   ]] && makedepends=( ${makedepends[*]/wasi-libc++*/}                                )
-[[ "${CARCH}" == 'i686'   ]] && makedepends+=( wasi-libc++=13.0.1-1.0 wasi-libc++abi=13.0.1-1.0              ) # dustbin
-[[ "${CARCH}" == 'i686'   ]] && makedepends+=( llvm13                                                        ) # rustup: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory
+             autoconf2.13 rust clang llvm jack nodejs cbindgen nasm python
+             lld dump_syms wasi-compiler-rt wasi-libc wasi-libc++ wasi-libc++abi
+)
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -81,9 +72,9 @@ source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.ta
 source+=(vendor.js.in
          arc4random.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-99.0.1-fdlibm-double.patch')
+source_i686=(avoid-libxul-OOM-python-check.patch
+             rust-static-disable-network-test-on-static-libraries.patch
+             firefox-99.0.1-fdlibm-double.patch)
 sha256sums=('0a5edd6adcc3de32adfc9452d89e0144cfb9a7dceacef3202e716fb4d5a8fb9e'
             'SKIP'
             'e00dbf01803cdd36fd9e1c0c018c19bb6f97e43016ea87062e6134bdc172bc7d'
@@ -98,9 +89,35 @@ sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e3
 validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger (VCS builds)
 
 
+## global tweaks and transient hacks ##
+
 # disable PGO for 32-bit arches
-_should_skip_pgo=0 # for x86_64
-[[ "${CARCH}" != 'armv7h' && "${CARCH}" != 'i686' ]] || _should_skip_pgo=1
+_should_skip_pgo=0 # for x86_64 (try '1' if the build hangs indefinitely)
+
+
+makedepends+=( python-setuptools python-zstandard )
+makedepends+=( python-psutil )
+makedepends+=(jq python-jsonschema)
+makedepends+=( ${makedepends[*]/python-zstandard/python-zstandard=0.17.0} ) # |  zstandard<=0.17.0,>=0.11.1: Installed with unexpected version "0.18.0"
+makedepends+=( ${makedepends[*]/python-psutil/python-psutil=5.8.0}        ) # |  psutil<=5.8.0,>=5.4.2: Installed with unexpected version "5.9.1"
+
+case "${CARCH}" in
+armv7h)
+  _should_skip_pgo=1
+
+  depends+=( icu=71.1 ) # ld.lld: error: undefined hidden symbol: std::type_info::operator==(std::type_info const&) const
+
+  makedepends=( ${makedepends[*]/wasi*/} ) # armv7h has no wasi compiler
+  ;;
+i686)
+  _should_skip_pgo=1
+
+  makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin
+  makedepends=( ${makedepends[*]/wasi-libc++*/}                                )
+  makedepends+=( wasi-libc++=13.0.1-1.0 wasi-libc++abi=13.0.1-1.0              ) # dustbin
+  makedepends+=( llvm13                                                        ) # rustup: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory
+  ;;
+esac
 
 
 ## helpers ##
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index bb2a7bf..261e0c8 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -86,12 +86,6 @@ makedepends=(unzip zip diffutils yasm mesa imake inetutils xorg-server-xvfb
              )
 makedepends+=(python-setuptools python-zstandard python-typing-extensions
               quilt libxslt imagemagick git jq python-jsonschema)
-makedepends+=( python-pydantic=1.9.2 ) # 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)"
-[[ "${CARCH}" == 'armv7h' ]] && makedepends=( ${makedepends[*]/wasi*/} ) # armv7h has no wasi compiler
-[[ "${CARCH}" == 'i686'   ]] && makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin
-[[ "${CARCH}" == 'i686'   ]] && makedepends=( ${makedepends[*]/wasi-libc++*/}                                )
-[[ "${CARCH}" == 'i686'   ]] && makedepends+=( wasi-libc++=13.0.1-1.0 wasi-libc++abi=13.0.1-1.0              ) # dustbin
-[[ "${CARCH}" == 'i686'   ]] && makedepends+=( llvm13                                                        ) # rustup: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'libnotify: Notification integration'
             'pulseaudio: Audio support'
@@ -113,11 +107,11 @@ source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}.bra
          vendor.js.in
          zstandard-0.18.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')
+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=('fb1ed65cd9e6698122885fe38984cfd00018c7a837109f511762b2986b391e25'
             'SKIP'
             '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58')
@@ -153,9 +147,28 @@ validpgpkeys+=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
 # _mozilla_api_key=e05d56db0a694edc8b5aaebda3f2db6a                          # anti-feature
 
 
+## global tweaks and transient hacks ##
+
 # disable PGO for 32-bit arches
 _should_skip_pgo=0 # for x86_64 (try '1' if the build hangs indefinitely)
-[[ "${CARCH}" != 'armv7h' && "${CARCH}" != 'i686' ]] || _should_skip_pgo=1
+
+# makedepends+=( python-pydantic=1.9.2 ) # 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
+
+  makedepends=( ${makedepends[*]/wasi*/} ) # armv7h has no wasi compiler
+  ;;
+i686)
+  _should_skip_pgo=1
+
+  makedepends=( ${makedepends[*]/wasi-compiler-rt/wasi-compiler-rt=13.0.1-1.0} ) # dustbin
+  makedepends=( ${makedepends[*]/wasi-libc++*/}                                )
+  makedepends+=( wasi-libc++=13.0.1-1.0 wasi-libc++abi=13.0.1-1.0              ) # dustbin
+  makedepends+=( llvm13                                                        ) # rustup: error while loading shared libraries: libLLVM-13.so: cannot open shared object file: No such file or directory
+  ;;
+esac
 
 
 ## helpers ##