[iceweasel]: tweak for armv7h and i686

1 files changed, 12 insertions, 18 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index b91a8b2b4..d50e42516 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -46,9 +46,6 @@
 #  - prefer as many system libs as possible, over their vendored couterparts
 #  - Rebrand to Iceweasel, per the mozilla trademark policy, due to the FSDG changes
 #  - set user profile directory to ~/.mozilla/iceweasel
-#  - FIXME: emergency patch for 32bit arches - update_uniffi_to_0.21.1.patch
-#           https://bugzilla.mozilla.org/show_bug.cgi?id=1805809
-#           https://hg.mozilla.org/releases/mozilla-beta/rev/42d532d3de54ece48fd29b0b07d160f0ec957b21
 #
 # privacy:
 #  - Remove Google API keys and usage
@@ -218,12 +215,6 @@ b2sums_i686=('97035e44cd1deae7bb2422c81eec7294feb51f43f460b4d7ddba083e1d8a48d265
              '009789d3bb93ba418929019135804fc3de7de161e5be8efba7fc75646fbde395720be5b7a7d3f5d1671f459fdd2944dd14aca306bbf1c975436d4f7765d62d15'
              'e4851eaa9030d9b8811f505f8f1569a41f8dc7cf586269108ebe370ac91896f69d36fc6d2e1937f427656fe4fca63031ca5e11d39a3667205a4b0a6f935cd548'
              'd20ce3eff595f85df86eaa0dfb665fc356f8987117a771f76adc4ac12046a7e82b0af182fa99f87ea1362a5026c9d0216c7b714649fef0c7294c61c8e8f4d790')
-source_armv7h+=(update_uniffi_to_0.21.1.patch) # https://hg.mozilla.org/releases/mozilla-beta/raw-rev/42d532d3de54
-source_i686+=(  update_uniffi_to_0.21.1.patch) # https://hg.mozilla.org/releases/mozilla-beta/raw-rev/42d532d3de54
-sha256sums_armv7h+=('1cf11d23455b71d5031200ca4dca8db7caa56d420ab7f37c035f08ef3e84351e') # update_uniffi_to_0.21.1.patch
-sha256sums_i686+=(  '1cf11d23455b71d5031200ca4dca8db7caa56d420ab7f37c035f08ef3e84351e') # update_uniffi_to_0.21.1.patch
-b2sums_armv7h+=('ef2c5c8f1e827735bb063f08b453e8d6647300dc6625c86fc8ab43fe14c461e357765f74db574af83d141f21240e62136ffca76c7b078007ee70e3f36e7041ab') # update_uniffi_to_0.21.1.patch
-b2sums_i686+=(  'ef2c5c8f1e827735bb063f08b453e8d6647300dc6625c86fc8ab43fe14c461e357765f74db574af83d141f21240e62136ffca76c7b078007ee70e3f36e7041ab') # update_uniffi_to_0.21.1.patch
 
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)  # anti-feature
@@ -248,16 +239,19 @@ case "${CARCH}" in
 armv7h)
   _should_skip_pgo=1
 
-  makedepends=( ${makedepends[*]/wasi*/} ) # armv7h has no wasi compiler
+  makedepends=( ${makedepends[*]/wasi-*/} ) # armv7h has no wasi compiler
 
   depends+=( icu=72.1 ) # --with-system-icu
-
-  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
   ;;
 i686)
   _should_skip_pgo=1
 
-  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
+  makedepends+=( llvm14 ) # rustup: error while loading shared libraries: libLLVM-14.so:
+
+  makedepends=( ${makedepends[*]/wasi-*/}                     ) # wasm-ld: error: cannot open /usr/lib/clang/15.0.7/lib/wasi/libclang_rt.builtins-wasm32.a: No such file or directory
+  makedepends+=( 'wasi-libc++>=15'      'wasi-libc++<16'      ) # in [community-testing]
+  makedepends+=( 'wasi-libc++abi>=15'   'wasi-libc++abi<16'   ) # in [community-testing]
+  makedepends+=( 'wasi-compiler-rt>=15' 'wasi-compiler-rt<16' ) # in [community-testing]
   ;;
 esac
 
@@ -490,11 +484,11 @@ EOF
 
     # use GCC vs LLVM
     cat >>../mozconfig <<END
-#export CC=gcc
-#export CXX=g++
-#export AR=gcc-ar
-#export NM=gcc-nm
-#export RANLIB=gcc-ranlib
+export CC=gcc
+export CXX=g++
+export AR=gcc-ar
+export NM=gcc-nm
+export RANLIB=gcc-ranlib
 END