[packages/mozjs102] - mozjs102 (from firefox 102esr), based on mozjs91.spec

Sun Nov 27 22:22:32 CET 2022

commit db2b29c307359675eac6e2c111484a893375d010
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Nov 27 22:23:01 2022 +0100

    - mozjs102 (from firefox 102esr), based on mozjs91.spec

 mozjs91.spec => mozjs102.spec | 32 ++++++++++++++++----------------
 system-virtualenv.patch       | 25 +++++++++++++------------
 x32.patch                     | 24 ------------------------
 3 files changed, 29 insertions(+), 52 deletions(-)
---

diff --git a/mozjs91.spec b/mozjs102.spec
similarity index 84%
rename from mozjs91.spec
rename to mozjs102.spec
index 41196d9..0a5901f 100644
--- a/mozjs91.spec
+++ b/mozjs102.spec
@@ -2,16 +2,16 @@
 # Conditional build:
 %bcond_without	tests	# tests build
 
-Summary:	SpiderMonkey 91 - JavaScript implementation
-Summary(pl.UTF-8):	SpiderMonkey 91 - implementacja języka JavaScript
-Name:		mozjs91
-Version:	91.7.1
-Release:	2
+Summary:	SpiderMonkey 102 - JavaScript implementation
+Summary(pl.UTF-8):	SpiderMonkey 102 - implementacja języka JavaScript
+Name:		mozjs102
+Version:	102.5.0
+Release:	1
 License:	MPL v2.0
 Group:		Libraries
-#Source0:	http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-%{version}.tar.bz2
+#Source0:	https://download.gnome.org/teams/releng/tarballs-needing-help/mozjs/mozjs-%{version}.tar.xz
 Source0:	https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
-# Source0-md5:	5bed22ca5921850b0fe250c512945f6f
+# Source0-md5:	3b3e610898ccda554519f744e634c50c
 Patch0:		copy-headers.patch
 Patch1:		system-virtualenv.patch
 Patch2:		include-configure-script.patch
@@ -27,7 +27,7 @@ BuildRequires:	libicu-devel >= 67.1
 BuildRequires:	libstdc++-devel >= 6:7
 BuildRequires:	llvm
 BuildRequires:	m4 >= 1.1
-BuildRequires:	nspr-devel >= 4.26
+BuildRequires:	nspr-devel >= 4.32
 BuildRequires:	perl-base >= 1:5.6
 BuildRequires:	pkgconfig
 BuildRequires:	python3 >= 1:3.8.5-3
@@ -36,11 +36,11 @@ BuildRequires:	readline-devel
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpmbuild(macros) >= 1.294
 BuildRequires:	rust >= 1.51.0
-BuildRequires:	rust-cbindgen >= 0.19.0
+BuildRequires:	rust-cbindgen >= 0.23.0
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 BuildRequires:	zlib-devel >= 1.2.3
-Requires:	nspr >= 4.26
+Requires:	nspr >= 4.32
 Requires:	zlib >= 1.2.3
 ExclusiveArch:	%{x8664} %{ix86} x32 aarch64 armv6hl armv7hl armv7hnl
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -65,7 +65,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe do biblioteki JavaScript
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	libstdc++-devel
-Requires:	nspr-devel >= 4.25
+Requires:	nspr-devel >= 4.32
 
 %description devel
 Header files for JavaScript reference library.
@@ -137,11 +137,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc js/src/README.html
-%attr(755,root,root) %{_bindir}/js91
-%attr(755,root,root) %{_libdir}/libmozjs-91.so
+%attr(755,root,root) %{_bindir}/js102
+%attr(755,root,root) %{_libdir}/libmozjs-102.so
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/js91-config
-%{_includedir}/mozjs-91
-%{_pkgconfigdir}/mozjs-91.pc
+%attr(755,root,root) %{_bindir}/js102-config
+%{_includedir}/mozjs-102
+%{_pkgconfigdir}/mozjs-102.pc
diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index 668fd89..d412b65 100644
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -1,13 +1,14 @@
---- firefox-91.7.1/python/mozbuild/mozbuild/virtualenv.py.orig	2022-04-04 19:48:54.691146163 +0200
-+++ firefox-91.7.1/python/mozbuild/mozbuild/virtualenv.py	2022-04-04 20:09:51.129698210 +0200
-@@ -106,9 +106,7 @@ class VirtualenvManager(VirtualenvHelper
-     @property
-     def virtualenv_script_path(self):
-         """Path to virtualenv's own populator script."""
--        return os.path.join(
--            self.topsrcdir, "third_party", "python", "virtualenv", "virtualenv.py"
--        )
-+        return '/usr/bin/virtualenv-3'
+--- firefox-96.0/python/mach/mach/site.py.orig	2022-01-06 19:32:46.000000000 +0100
++++ firefox-96.0/python/mach/mach/site.py	2022-01-12 13:21:03.273897180 +0100
+@@ -848,10 +848,7 @@
  
-     def version_info(self):
-         return eval(
+ 
+ def _virtualenv_py_path(topsrcdir):
+-    return os.path.join(
+-        topsrcdir, "third_party", "python", "virtualenv", "virtualenv.py"
+-    )
+-
++    return '/usr/bin/virtualenv-3'
+ 
+ def _resolve_installed_packages(python_executable):
+     pip_json = subprocess.check_output(
diff --git a/x32.patch b/x32.patch
index 85819a9..5cac582 100644
--- a/x32.patch
+++ b/x32.patch
@@ -54,27 +54,3 @@
    Digit quotient;
    Digit rem;
    __asm__("divq  %[divisor]"
---- firefox-91.7.1/js/src/gc/GC.cpp.orig	2022-04-04 16:32:41.617512402 +0200
-+++ firefox-91.7.1/js/src/gc/GC.cpp	2022-04-04 16:45:29.361453166 +0200
-@@ -303,8 +303,10 @@ static_assert(js::detail::LIFO_ALLOC_ALI
-               "CellFlagBitsReservedForGC should support LifoAlloc");
- static_assert(CellAlignBytes >= MinFirstWordAlignment,
-               "CellFlagBitsReservedForGC should support gc::Cell");
-+#ifndef JS_CODEGEN_NONE
- static_assert(js::jit::CodeAlignment >= MinFirstWordAlignment,
-               "CellFlagBitsReservedForGC should support JIT code");
-+#endif
- static_assert(js::gc::JSClassAlignBytes >= MinFirstWordAlignment,
-               "CellFlagBitsReservedForGC should support JSClass pointers");
- static_assert(js::ScopeDataAlignBytes >= MinFirstWordAlignment,
---- firefox-91.7.1/js/src/wasm/WasmFrame.h.orig	2022-03-13 15:31:41.000000000 +0100
-+++ firefox-91.7.1/js/src/wasm/WasmFrame.h	2022-04-05 19:49:49.624104638 +0200
-@@ -230,7 +230,7 @@ class DebugFrame {
-   // Avoid -Wunused-private-field warnings.
-  protected:
- #if defined(JS_CODEGEN_MIPS32) || defined(JS_CODEGEN_ARM) || \
--    defined(JS_CODEGEN_X86) || defined(__wasi__)
-+    defined(JS_CODEGEN_X86) || defined(__wasi__) || (defined(JS_CODEGEN_NONE) && defined(__ILP32__))
-   // See alignmentStaticAsserts().  For MIPS32, ARM32 and X86 DebugFrame is only
-   // 4-byte aligned, so we add another word to get up to 8-byte
-   // alignment.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mozjs102.git/commitdiff/db2b29c307359675eac6e2c111484a893375d010

