aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

[spidermonkey] Bump mozjs dependency to mozjs-115

Browse Source
This commit is contained in:
Witold Filipczyk 2024-01-01 13:24:32 +01:00
parent 378842a349
commit f89705df74
7 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -787,8 +787,8 @@ SPIDERMONKEY_FOUND=
if test "x$CONFIG_SPIDERMONKEY" = xyes || if test "x$CONFIG_SPIDERMONKEY" = xyes ||
test "x$CONFIG_SCRIPTING_SPIDERMONKEY" = xyes; then test "x$CONFIG_SCRIPTING_SPIDERMONKEY" = xyes; then
package=mozjs-102 package=mozjs-115
AC_MSG_CHECKING([for SpiderMonkey (mozjs-102) in pkg-config $package]) AC_MSG_CHECKING([for SpiderMonkey (mozjs-115) in pkg-config $package])
if $PKG_CONFIG $pkg_config_static --cflags --libs $package > /dev/null 2>&AS_MESSAGE_LOG_FD; then if $PKG_CONFIG $pkg_config_static --cflags --libs $package > /dev/null 2>&AS_MESSAGE_LOG_FD; then
DB_LOCALSTORAGE_LIBS="$($PKG_CONFIG $pkg_config_static --libs sqlite3)" DB_LOCALSTORAGE_LIBS="$($PKG_CONFIG $pkg_config_static --libs sqlite3)"
CURL_LIBS="$($PKG_CONFIG $pkg_config_static --libs libcurl)" CURL_LIBS="$($PKG_CONFIG $pkg_config_static --libs libcurl)"

2
meson.build
View File

@ -455,7 +455,7 @@ endif
mozjsdeps = [] mozjsdeps = []
if conf_data.get('CONFIG_ECMASCRIPT_SMJS') or conf_data.get('CONFIG_SCRIPTING_SPIDERMONKEY') if conf_data.get('CONFIG_ECMASCRIPT_SMJS') or conf_data.get('CONFIG_SCRIPTING_SPIDERMONKEY')
mozjsdeps = dependency('mozjs-102', static: st) mozjsdeps = dependency('mozjs-115', static: st)
deps += mozjsdeps deps += mozjsdeps
endif endif

5
src/ecmascript/spidermonkey-shared.cpp
View File

@ -96,11 +96,12 @@ spidermonkey_InitClass(JSContext *cx, JSObject *obj,
JSPropertySpec *ps, JSPropertySpec *ps,
const spidermonkeyFunctionSpec *fs, const spidermonkeyFunctionSpec *fs,
JSPropertySpec *static_ps, JSPropertySpec *static_ps,
const spidermonkeyFunctionSpec *static_fs) const spidermonkeyFunctionSpec *static_fs,
const char *name)
{ {
JS::RootedObject hobj(cx, obj); JS::RootedObject hobj(cx, obj);
JS::RootedObject r_parent_proto(cx, parent_proto); JS::RootedObject r_parent_proto(cx, parent_proto);
JSObject *proto = JS_InitClass(cx, hobj, r_parent_proto, clasp, JSObject *proto = JS_InitClass(cx, hobj, clasp, r_parent_proto, name,
constructor, nargs, constructor, nargs,
ps, NULL, static_ps, NULL); ps, NULL, static_ps, NULL);

3
src/ecmascript/spidermonkey-shared.h
View File

@ -35,7 +35,8 @@ JSObject *spidermonkey_InitClass(JSContext *cx, JSObject *obj,
JSPropertySpec *ps, JSPropertySpec *ps,
const spidermonkeyFunctionSpec *fs, const spidermonkeyFunctionSpec *fs,
JSPropertySpec *static_ps, JSPropertySpec *static_ps,
const spidermonkeyFunctionSpec *static_fs); const spidermonkeyFunctionSpec *static_fs,
const char *name);
bool spidermonkey_check_if_function_name(const spidermonkeyFunctionSpec funcs[], const char *string); bool spidermonkey_check_if_function_name(const spidermonkeyFunctionSpec funcs[], const char *string);

24
src/ecmascript/spidermonkey.cpp
View File

@ -195,7 +195,7 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
&document_class, NULL, 0, &document_class, NULL, 0,
document_props, document_props,
document_funcs, document_funcs,
NULL, NULL); NULL, NULL, "document");
if (!document_obj) { if (!document_obj) {
goto release_and_fail; goto release_and_fail;
} }
@ -217,7 +217,7 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
&history_class, NULL, 0, &history_class, NULL, 0,
(JSPropertySpec *) NULL, (JSPropertySpec *) NULL,
history_funcs, history_funcs,
NULL, NULL); NULL, NULL, "history");
if (!history_obj) { if (!history_obj) {
goto release_and_fail; goto release_and_fail;
} }
@ -225,14 +225,14 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
&screen_class, NULL, 0, &screen_class, NULL, 0,
screen_props, screen_props,
NULL, NULL,
NULL, NULL); NULL, NULL, "screen");
if (!screen_obj) { if (!screen_obj) {
goto release_and_fail; goto release_and_fail;
} }
menubar_obj = JS_InitClass(ctx, global, nullptr, menubar_obj = JS_InitClass(ctx, global, &menubar_class, nullptr,
&menubar_class, NULL, 0, "menubar", NULL, 0,
unibar_props, NULL, unibar_props, NULL,
NULL, NULL); NULL, NULL);
if (!menubar_obj) { if (!menubar_obj) {
@ -240,8 +240,8 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
} }
JS::SetReservedSlot(menubar_obj, 0, JS::PrivateValue((char *)"t")); /* to @menubar_class */ JS::SetReservedSlot(menubar_obj, 0, JS::PrivateValue((char *)"t")); /* to @menubar_class */
statusbar_obj = JS_InitClass(ctx, global, nullptr, statusbar_obj = JS_InitClass(ctx, global, &statusbar_class, nullptr,
&statusbar_class, NULL, 0, "statusbar", NULL, 0,
unibar_props, NULL, unibar_props, NULL,
NULL, NULL); NULL, NULL);
if (!statusbar_obj) { if (!statusbar_obj) {
@ -249,8 +249,8 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
} }
JS::SetReservedSlot(statusbar_obj, 0, JS::PrivateValue((char *)"s")); /* to @statusbar_class */ JS::SetReservedSlot(statusbar_obj, 0, JS::PrivateValue((char *)"s")); /* to @statusbar_class */
navigator_obj = JS_InitClass(ctx, global, nullptr, navigator_obj = JS_InitClass(ctx, global, &navigator_class, nullptr,
&navigator_class, NULL, 0, "navigator", NULL, 0,
navigator_props, NULL, navigator_props, NULL,
NULL, NULL); NULL, NULL);
if (!navigator_obj) { if (!navigator_obj) {
@ -261,7 +261,7 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
&console_class, NULL, 0, &console_class, NULL, 0,
nullptr, nullptr,
console_funcs, console_funcs,
NULL, NULL); NULL, NULL, "console");
if (!console_obj) { if (!console_obj) {
goto release_and_fail; goto release_and_fail;
} }
@ -270,7 +270,7 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
&localstorage_class, NULL, 0, &localstorage_class, NULL, 0,
nullptr, nullptr,
localstorage_funcs, localstorage_funcs,
NULL, NULL); NULL, NULL, "localstorage");
if (!localstorage_obj) { if (!localstorage_obj) {
goto release_and_fail; goto release_and_fail;
} }
@ -279,7 +279,7 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
&xhr_class, xhr_constructor, 0, &xhr_class, xhr_constructor, 0,
xhr_props, xhr_props,
xhr_funcs, xhr_funcs,
xhr_static_props, NULL); xhr_static_props, NULL, "xhr");
if (!xhr_obj) { if (!xhr_obj) {
goto release_and_fail; goto release_and_fail;

2
src/scripting/smjs/elinks_object.cpp
View File

@ -143,7 +143,7 @@ smjs_get_elinks_object(void)
return spidermonkey_InitClass(smjs_ctx, obj, NULL, return spidermonkey_InitClass(smjs_ctx, obj, NULL,
(JSClass *) &elinks_class, NULL, 0, (JSClass *) &elinks_class, NULL, 0,
(JSPropertySpec *) elinks_props, (JSPropertySpec *) elinks_props,
elinks_funcs, NULL, NULL); elinks_funcs, NULL, NULL, "elinks");
} }
void void

2
src/scripting/smjs/session_object.cpp
View File

@ -1134,5 +1134,5 @@ smjs_init_session_interface(void)
spidermonkey_InitClass(smjs_ctx, obj, NULL, spidermonkey_InitClass(smjs_ctx, obj, NULL,
(JSClass *) &session_class, session_construct, (JSClass *) &session_class, session_construct,
0, (JSPropertySpec *) session_props, 0, (JSPropertySpec *) session_props,
session_funcs, NULL, NULL); session_funcs, NULL, NULL, "session");
} }