diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..05a0e946187b8160d0c54c23a9f8100f44e0f43b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..1124613d4626d46a5b81a98ee76f9ff308937a62 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/mozjs102 diff --git a/firefox-102.9.0esr.source.tar.xz b/firefox-102.9.0esr.source.tar.xz index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d9ff7ef9a8966b4e32da9f6b310d1939a73b3b76 100644 --- a/firefox-102.9.0esr.source.tar.xz +++ b/firefox-102.9.0esr.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31b074623f09ca821a8a7dee0b3d2df1a45f1164264d31c26b4969a4d6a21dd1 +size 484308672 diff --git a/firefox-102.9.0esr.source.tar.xzaa b/firefox-102.9.0esr.source.tar.xzaa deleted file mode 100644 index 4490f75866faf431d27b81140c5d8dd38f3d2938..0000000000000000000000000000000000000000 Binary files a/firefox-102.9.0esr.source.tar.xzaa and /dev/null differ diff --git a/firefox-102.9.0esr.source.tar.xzab b/firefox-102.9.0esr.source.tar.xzab deleted file mode 100644 index e3a7a70c2c3e7e53b58b91269a3e83abd5f1639d..0000000000000000000000000000000000000000 Binary files a/firefox-102.9.0esr.source.tar.xzab and /dev/null differ diff --git a/firefox-102.9.0esr.source.tar.xzac b/firefox-102.9.0esr.source.tar.xzac deleted file mode 100644 index 1522eb647ecbca1e9b792aa31a3415ca1612388c..0000000000000000000000000000000000000000 Binary files a/firefox-102.9.0esr.source.tar.xzac and /dev/null differ diff --git a/firefox-102.9.0esr.source.tar.xzad b/firefox-102.9.0esr.source.tar.xzad deleted file mode 100644 index 0f8f43eba883822ac74e0792d80fdee2097a1e9e..0000000000000000000000000000000000000000 Binary files a/firefox-102.9.0esr.source.tar.xzad and /dev/null differ diff --git a/icu-76.patch b/icu-76.patch new file mode 100644 index 0000000000000000000000000000000000000000..28493e067577c71a1ed57037496dac0be69e35dd --- /dev/null +++ b/icu-76.patch @@ -0,0 +1,11 @@ +--- firefox-102.9.0/js/moz.configure.orig 2025-03-11 12:47:41.254391903 +0800 ++++ firefox-102.9.0/js/moz.configure 2025-03-11 12:48:04.238721011 +0800 +@@ -1153,7 +1153,7 @@ + # ====================================================== + system_lib_option("--with-system-icu", help="Use system ICU") + +-system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 71.1", when="--with-system-icu") ++system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 71.1 icu-uc >= 71.1", when="--with-system-icu") + + + @depends("--with-system-icu") diff --git a/mozjs102.spec b/mozjs102.spec index 3e95d3502929d8f2b8498a02c7181dbeffe4f265..1540a9d8e2e4e0cd216e2d2ed517c0661880a7e7 100644 --- a/mozjs102.spec +++ b/mozjs102.spec @@ -23,7 +23,7 @@ Name: mozjs%{major} Version: 102.9.0 -Release: 7 +Release: 8 Summary: SpiderMonkey JavaScript library License: MPL-2.0 AND Apache-2.0 AND BSD-3-Clause AND BSD-2-Clause AND MIT AND GPL-3.0-or-later URL: https://hg.mozilla.org/releases/mozilla-esr102 @@ -32,11 +32,6 @@ Source0: https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/sourc # Known failures with system libicu Source1: known_failures.txt -Source10: firefox-102.9.0esr.source.tar.xzaa -Source11: firefox-102.9.0esr.source.tar.xzab -Source12: firefox-102.9.0esr.source.tar.xzac -Source13: firefox-102.9.0esr.source.tar.xzad - # Patches from mozjs68, rebased for mozjs78: Patch01: fix-soname.patch Patch02: copy-headers.patch @@ -51,6 +46,7 @@ Patch13: tests-Use-native-TemporaryDirectory.patch # Build fixes Patch14: init_patch.patch Patch15: remove-sloppy-m4-detection-from-bundled-autoconf.patch +Patch16: icu-76.patch # TODO: Check with mozilla for cause of these fails and re-enable spidermonkey compile time checks if needed Patch20: spidermonkey_checks_disable.patch @@ -115,7 +111,6 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -cat %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} > %{SOURCE0} %autosetup -n firefox-%{version}/js/src -N pushd ../.. @@ -257,6 +252,9 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so %{_includedir}/mozjs-%{major}/ %changelog +* Tue Mar 11 2025 Funda Wang - 102.9.0-8 +- fix build with icu 76 + * Mon Mar 10 2025 mahailiang - 102.9.0-7 - add sw_64 support