[iceweasel]: tweak for i686

3 files changed, 45 insertions, 34 deletions

diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 38b5f9156..25bfb9773 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -195,11 +195,11 @@ sha256sums+=('b701b4c47fca2661feeabe172e398c76c8015ee08ff4cc3cc2f7c3ef2ed692a7'
              '8e113fd2730be3fd11b2a24918dd62e8741513cf4dce9819d8eae358c5411adc'  # vendor.js.in
              'aa663d899e924f4979114584cad671dad3b93dd9b0dfe28bb1cf11ddf92e6d47') # zstandard-0.21.0.diff
 sha256sums_armv7h=('2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
-sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353'
-                 '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041'
-                 'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1'
-                 '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06'
-                 'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544')
+sha256sums_i686=('a8786bb747ae8a12d28268f6731621810e13f405b664373b23a3070d5ed21302'  # avoid-libxul-OOM-python-check.patch
+                 'b25d9fb901afc5447bcd87416741f705eb7188502e10097387d5b0c86417fd01'  # rust-static-disable-network-test-on-static-libraries.patch
+                 'ed3bb281697af7c4353a34067ffb4b18a971d40757bef2d6af3c8bf2d28d42d1'  # firefox-111.0.1-fdlibm.patch
+                 '2fb39374fd3d80eea9e346032a2a4b2bc2e357dee7380855b24bcf19b1335d06'  # fix-i686-build-moz-1792159.patch
+                 'c3ce181fbb0142055aa6dd17f3cda2ba6a1e54d7a689a8c6e9cce76aa40e6544') # fix-i686-xsimd-incomplete.patch
 b2sums=('748e7ea88f493d449e52e94a268190f9beca671aebba057f7089897dee51d3e8d45c6f9721d38891c787b401cb6b32128d3b3b25073e17326c8fca80fe07d015'
         'SKIP'
         'f86353bbba05d8994db34c6abb66094aa61d2c37c8599930dbe9d215413f0f718a1ce55a8f2d07a65074c3947e28fc80d44c925bd9be239a870f82d2a1803635')
@@ -213,11 +213,11 @@ b2sums+=('a22044292e464b3922eb2e4a8cf0993524d232eeb4a8602707589d00f690498d3b76e5
          '5302b6abcfec3155c578e0664e6a0ac921234c5912d74c4a9b0feb3a051ed4ef5f11b93ee37739a3a92fc6693683374f92ac9c3f560780f879c4249d0718157a'  # vendor.js.in
          '2e568bb28f23f0f9225ca68a5084e3e835f6bd15046eea9d615d3462146da649c1b6b7439b4d768759bda2658d54ca73c9b3479e5e0b6d7a58822664dbe45aa2') # zstandard-0.21.0.diff
 b2sums_armv7h=('6e5980e56343a23bce4fcda58f6abc8f2debca0c278c87b09e53abb17ff15849c26e8df3bbff2388985f8fe5a4e9be9982c602ef7159546f0ae335fca1000a41')
-b2sums_i686=('97035e44cd1deae7bb2422c81eec7294feb51f43f460b4d7ddba083e1d8a48d265a36ca43cf1d9dee49b01ee6df0c76e0f6916cc73cb7ad9caa1c235a59da0e4'
-             '009789d3bb93ba418929019135804fc3de7de161e5be8efba7fc75646fbde395720be5b7a7d3f5d1671f459fdd2944dd14aca306bbf1c975436d4f7765d62d15'
-             '05c7c9727201971650df4ca2e00539767fc9e159539835c641fccab5ec9577a7294e8f62f5d0670158316e5467ea121c03a36fd4ba153e1d60f3402f0430548d'
-             'd20ce3eff595f85df86eaa0dfb665fc356f8987117a771f76adc4ac12046a7e82b0af182fa99f87ea1362a5026c9d0216c7b714649fef0c7294c61c8e8f4d790'
-             '3e6fd4cebe0fd4c250ccf5b04e12b93e5f4cc2d139301316c987cc07a57b4b6b49b830d745520a82f5ac59da8d17f728a3ecce4dccf21804a2d6a256a6f76472')
+b2sums_i686=('01e1bcb331b6147b822fe4c45dd195f38e670db08bdff16db1c21dc2d529f4f783d5798cde415fec782c8fc9cf79ce70dadcc013be3c9d4f5a09fc3a1ee0744d'  # avoid-libxul-OOM-python-check.patch
+             '32c60a9259f9ab6b950c0a3af81e4c36c14160860d3b9da70aa3fbc3676e5fd2b2705b02d7e6b6ac49f9510577de89ab2334abe3b0a126e3d70e65ac42ba62c9'  # rust-static-disable-network-test-on-static-libraries.patch
+             '05c7c9727201971650df4ca2e00539767fc9e159539835c641fccab5ec9577a7294e8f62f5d0670158316e5467ea121c03a36fd4ba153e1d60f3402f0430548d'  # firefox-111.0.1-fdlibm.patch
+             'd20ce3eff595f85df86eaa0dfb665fc356f8987117a771f76adc4ac12046a7e82b0af182fa99f87ea1362a5026c9d0216c7b714649fef0c7294c61c8e8f4d790'  # fix-i686-build-moz-1792159.patch
+             '3e6fd4cebe0fd4c250ccf5b04e12b93e5f4cc2d139301316c987cc07a57b4b6b49b830d745520a82f5ac59da8d17f728a3ecce4dccf21804a2d6a256a6f76472') # fix-i686-xsimd-incomplete.patch
 
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)  # anti-feature
@@ -262,6 +262,15 @@ case "${CARCH}" in
 armv7h)
   makedepends=( ${makedepends[*]/wasi-*/} ) # armv7h has no wasi compiler
   ;;
+i686)
+  # NOTE: due to python incompatabilities in arch32,
+  #       we are building for i686 against the repos from 2023-04-05 - but ...
+  #         ERROR: Rust compiler 1.63.0 is too old.
+  #                To compile Rust language sources please install at least version 1.66.0 of the 'rustc' toolchain
+  #         ERROR: Package 'nss' has version '3.89', required version is '>= 3.92'
+  #       so the build also requires the current 'rust' and 'nss';
+  #       though this recipe can not explictly require them
+  ;;
 esac
 
 
diff --git a/libre/iceweasel/avoid-libxul-OOM-python-check.patch b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
index 632281134..01d6f98d4 100644
--- a/libre/iceweasel/avoid-libxul-OOM-python-check.patch
+++ b/libre/iceweasel/avoid-libxul-OOM-python-check.patch
@@ -1,30 +1,31 @@
-diff -rauN a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk	2020-10-13 20:28:50.994026769 +0200
-+++ b/config/rules.mk	2020-10-13 20:29:06.594023940 +0200
-@@ -470,7 +470,7 @@
+diff --git a/config/rules.mk b/config/rules.mk
+index f1eb7fd..609e720 100644
+--- a/config/rules.mk
++++ b/config/rules.mk
+@@ -422,7 +422,7 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
  	$(LINKER) -OUT:$@ -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
  else # !WINNT || GNU_CC
- 	$(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
--	$(call py_action,check_binary,--target $@)
-+#	$(call py_action,check_binary,--target $@)
+ 	$(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
+-	$(call py_action,check_binary,$@)
++#	$(call py_action,check_binary,$@)
  endif # WINNT && !GNU_CC
  
  ifdef ENABLE_STRIP
-@@ -514,7 +514,7 @@
+@@ -463,7 +463,7 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
  	$(LINKER) -out:$@ -pdb:$(LINK_PDBFILE) $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
  else
- 	$(call EXPAND_CC_OR_CXX,$@) $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) -o $@ $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
--	$(call py_action,check_binary,--target $@)
-+#	$(call py_action,check_binary,--target $@)
+ 	$(call EXPAND_CC_OR_CXX,$@) $(COMPUTED_CXX_LDFLAGS) -o $@ $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
+-	$(call py_action,check_binary,$@)
++#	$(call py_action,check_binary,$@)
  endif # WINNT && !GNU_CC
  
  ifdef ENABLE_STRIP
-@@ -594,7 +594,7 @@
+@@ -524,7 +524,7 @@ $(SHARED_LIBRARY): $(OBJS) $(call resfile,$(SHARED_LIBRARY)) $(STATIC_LIBS) $(EX
+ 	$(REPORT_BUILD)
  	$(RM) $@
- endif
  	$(MKSHLIB) $($@_OBJS) $(filter %.res,$^) $(LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
--	$(call py_action,check_binary,--target $@)
-+#	$(call py_action,check_binary,--target $@)
+-	$(call py_action,check_binary,$@)
++#	$(call py_action,check_binary,$@)
  
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
  endif	# WINNT && !GCC
diff --git a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
index c9ae89cb4..b8217d5db 100644
--- a/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
+++ b/libre/iceweasel/rust-static-disable-network-test-on-static-libraries.patch
@@ -1,7 +1,8 @@
-diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk
---- a/config/makefiles/rust.mk	2020-10-13 20:23:09.920635480 +0200
-+++ b/config/makefiles/rust.mk	2020-10-13 20:24:02.273994137 +0200
-@@ -324,17 +324,17 @@
+diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
+index 5d1d547..a04aeaf 100644
+--- a/config/makefiles/rust.mk
++++ b/config/makefiles/rust.mk
+@@ -450,17 +450,17 @@ $(RUST_LIBRARY_FILE): $(CARGO_FILE) $(if $(RUST_LIBRARY_DEPS),$(RUST_LIBRARY_DEP
  # the chance of proxy bypasses originating from rust code.
  # The check only works when rust code is built with -Clto but without MOZ_LTO_RUST_CROSS.
  # Sanitizers and sancov also fail because compiler-rt hooks network functions.
@@ -10,7 +11,7 @@ diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk
 -ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
 -ifndef MOZ_LTO_RUST_CROSS
 -ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
--	$(call py_action,check_binary,--target --networking $@)
+-	$(call py_action,check_binary,--networking $@)
 -endif
 -endif
 -endif
@@ -19,14 +20,14 @@ diff -rauN a/config/makefiles/rust.mk b/config/makefiles/rust.mk
 +#ifndef MOZ_PROFILE_GENERATE
 +#ifeq ($(OS_ARCH), Linux)
 +#ifeq (,$(rustflags_sancov)$(MOZ_ASAN)$(MOZ_TSAN)$(MOZ_UBSAN))
-+#ifndef MOZ_LTO_RUST
++#ifndef MOZ_LTO_RUST_CROSS
 +#ifneq (,$(filter -Clto,$(cargo_rustc_flags)))
-+#	$(call py_action,check_binary,--target --networking $@)
++#	$(call py_action,check_binary,--networking $@)
 +#endif
 +#endif
 +#endif
 +#endif
 +#endif
  
- force-cargo-library-check:
- 	$(call CARGO_CHECK) --lib $(cargo_target_flag) $(rust_features_flag)
+ define make_default_rule
+ $(1):