From 72c95b665531288cf06f64594820cd538f71348c Mon Sep 17 00:00:00 2001
From: František Zatloukal <fzatlouk@redhat.com>
Date: Jul 28 2022 12:45:48 +0000
Subject: Switch to system-icu everywhere to fix FTBFS


---

diff --git a/known_failures.txt b/known_failures.txt
new file mode 100644
index 0000000..c861e1d
--- /dev/null
+++ b/known_failures.txt
@@ -0,0 +1,13 @@
+non262/Date/toString-localized-posix.js
+non262/Date/reset-time-zone-cache-same-offset.js
+non262/Date/time-zones-historic.js
+non262/Date/toString-localized.js
+non262/Date/time-zones-imported.js
+non262/Date/time-zone-path.js
+non262/Intl/DateTimeFormat/tz-environment-variable.js
+non262/Intl/DateTimeFormat/format_timeZone.js
+non262/Intl/DateTimeFormat/format.js
+non262/Intl/Date/toLocaleString_timeZone.js
+non262/Intl/Date/toLocaleDateString_timeZone.js
+non262/Intl/RelativeTimeFormat/format.js
+test262/intl402/RelativeTimeFormat/prototype/format/en-us-numeric-auto.js
diff --git a/mozjs68.spec b/mozjs68.spec
index 8cc4f59..e0e65f3 100644
--- a/mozjs68.spec
+++ b/mozjs68.spec
@@ -6,11 +6,6 @@
 # Require tests to pass?
 %global require_tests     1
 
-# Linking fails on armv7hl when using bundled icu, use system one for it, there are bunch of more test failures
-%ifarch armv7hl
-%global require_tests     0
-%endif
-
 %if 0%{?build_with_lto}
 # LTO is default since F33
 %else
@@ -29,13 +24,16 @@
 
 Name:           mozjs%{major}
 Version:        68.12.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        SpiderMonkey JavaScript library
 
 License:        MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2+ and AFL and ASL 2.0
 URL:            https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
 Source0:        https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
 
+# Known failures with system libicu
+Source1:        known_failures.txt
+
 # Patches from Debian mozjs60, rebased for mozjs68:
 Patch01:        fix-soname.patch
 Patch02:        copy-headers.patch
@@ -66,10 +64,8 @@ Patch26:        build-icu-big-endian.patch
 # Support Python 3 in js tests
 Patch30:        jstests_python-3.patch
 
-%ifarch armv7hl
 BuildRequires:  libicu-devel
-%endif
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  autoconf213
 BuildRequires:  cargo
 BuildRequires:  clang-devel
@@ -137,6 +133,9 @@ pushd ../..
 # Execute tests with Python 3
 %patch30 -p1
 
+# Copy out file containing known test failures with system libicu
+cp %{SOURCE1} js/src/
+
 # make sure we don't ever accidentally link against bundled security libs
 rm -rf security/
 popd
@@ -162,11 +161,7 @@ export PYTHON="%{__python2}"
 
 autoconf-2.13
 %configure \
-%ifnarch armv7hl
-  --without-system-icu \
-%else
   --with-system-icu \
-%endif
   --enable-posix-nspr-emulation \
   --with-system-zlib \
   --disable-tests \
@@ -246,9 +241,9 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
 %check
 # Run SpiderMonkey tests
 %if 0%{?require_tests}
-PYTHONPATH=tests/lib %{__python3} tests/jstests.py -d -s -t 1800 --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major}
+PYTHONPATH=tests/lib %{__python3} tests/jstests.py -d -s -t 1800 --exclude-file=known_failures.txt --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major}
 %else
-PYTHONPATH=tests/lib %{__python3} tests/jstests.py -d -s -t 1800 --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major} || :
+PYTHONPATH=tests/lib %{__python3} tests/jstests.py -d -s -t 1800 --exclude-file=known_failures.txt --no-progress --wpt=disabled ../../js/src/dist/bin/js%{major} || :
 %endif
 
 # Run basic JIT tests
@@ -271,6 +266,9 @@ PYTHONPATH=tests/lib %{__python3} jit-test/jit_test.py -s -t 1800 --no-progress 
 %{_includedir}/mozjs-%{major}/
 
 %changelog
+* Thu Jul 28 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 68.12.0-7
+- Switch to system-icu everywhere to fix FTBFS
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 68.12.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild