[packages/js] Rel 13

arekm arekm at pld-linux.org
Fri Apr 10 23:03:21 CEST 2026


commit 04f316e79d53a251ad49a2b6d2dd7715253a914d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Apr 10 23:03:11 2026 +0200

    Rel 13

 js-liveconnect-jni.patch | 20 ++++++++++++++++++++
 js-va_list.patch         | 11 +++++++++++
 js.spec                  |  6 +++++-
 3 files changed, 36 insertions(+), 1 deletion(-)
---
diff --git a/js.spec b/js.spec
index 56fb892..f44a509 100644
--- a/js.spec
+++ b/js.spec
@@ -7,7 +7,7 @@ Summary:	JavaScript Reference Implementation
 Summary(pl.UTF-8):	Wzorcowa implementacja JavaScriptu
 Name:		js
 Version:	1.7.0
-Release:	12
+Release:	13
 Epoch:		2
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		Development/Languages
@@ -16,6 +16,8 @@ Source0:	http://ftp.mozilla.org/pub/mozilla.org/js/%{name}-%{version}.tar.gz
 Patch0:		%{name}-makefile.patch
 Patch1:		%{name}-java.patch
 Patch2:		%{name}-build.patch
+Patch3:		%{name}-va_list.patch
+Patch4:		%{name}-liveconnect-jni.patch
 URL:		http://www.mozilla.org/js/
 %{?with_java:BuildRequires:	jdk}
 %{?with_java:BuildRequires:	jpackage-utils}
@@ -145,6 +147,8 @@ Biblioteka statyczna implementacji JavaScript LiveConnect 3.
 %patch -P0 -p1
 %patch -P1 -p1
 %patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
 
 echo 'SONAME=libjs.so.1' >> src/Makefile.ref
 echo 'SONAME=libjsj.so.1' >> src/liveconnect/Makefile.ref
diff --git a/js-liveconnect-jni.patch b/js-liveconnect-jni.patch
new file mode 100644
index 0000000..7475b6f
--- /dev/null
+++ b/js-liveconnect-jni.patch
@@ -0,0 +1,20 @@
+--- js/src/liveconnect/jsj_simpleapi.c.orig	2026-04-10 22:42:14.996425232 +0200
++++ js/src/liveconnect/jsj_simpleapi.c	2026-04-10 22:42:26.366730217 +0200
+@@ -135,7 +135,7 @@
+         vm_args.classpath = (char*)full_classpath;
+     }
+ 
+-    err = JNI_CreateJavaVM((JavaVM**)jvm, initialEnv, &vm_args);
++    err = JNI_CreateJavaVM((JavaVM**)jvm, (void **)initialEnv, &vm_args);
+     
+     if (full_classpath)
+         JS_smprintf_free(full_classpath);
+@@ -156,7 +156,7 @@
+ {
+     JavaVM* java_vm = (JavaVM*)jvm;
+     JNIEnv* env = NULL;
+-    (*java_vm)->AttachCurrentThread(java_vm, &env, NULL);
++    (*java_vm)->AttachCurrentThread(java_vm, (void **)&env, NULL);
+     return env;
+ }
+ 
diff --git a/js-va_list.patch b/js-va_list.patch
new file mode 100644
index 0000000..e921a9b
--- /dev/null
+++ b/js-va_list.patch
@@ -0,0 +1,11 @@
+--- js/src/jsapi.c.orig	2007-10-03 00:04:17.000000000 +0000
++++ js/src/jsapi.c	2026-04-10 00:00:00.000000000 +0000
+@@ -90,7 +90,7 @@
+ #include "jsiter.h"
+ #endif
+
+-#ifdef HAVE_VA_LIST_AS_ARRAY
++#if defined(HAVE_VA_LIST_AS_ARRAY) || defined(__x86_64__)
+ #define JS_ADDRESSOF_VA_LIST(ap) ((va_list *)(ap))
+ #else
+ #define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/js.git/commitdiff/04f316e79d53a251ad49a2b6d2dd7715253a914d



More information about the pld-cvs-commit mailing list