RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 28-Feb-2010 01:23:41 Branch: rpm-5_2 Handle: 2010022800234001 Modified files: (Branch: rpm-5_2) rpm configure.ac rpm/js rpm-js.h rpmds-js.c rpmjsfile.c Log: backport last fixes to make building with external libjs actually work :) Summary: Revision Changes Path 2.372.2.11 +5 -2 rpm/configure.ac 1.2.2.1 +8 -0 rpm/js/rpm-js.h 1.12.2.4 +1 -1 rpm/js/rpmds-js.c 1.1.2.2 +4 -0 rpm/js/rpmjsfile.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/configure.ac ============================================================================ $ cvs diff -u -r2.372.2.10 -r2.372.2.11 configure.ac --- rpm/configure.ac 27 Feb 2010 09:37:48 -0000 2.372.2.10 +++ rpm/configure.ac 28 Feb 2010 00:23:40 -0000 2.372.2.11 @@ -1324,18 +1324,21 @@ ], []) dnl # JavaScript +WITH_JS_SUBDIR="" WITH_SPIDERMONKEY_SUBDIR="" RPM_CHECK_LIB( [JavaScript], [js], [js], [JS_NewContext], [jsstddef.h], - [no,internal:none], [js:src:src], + [no,internal:external:none], [js:src:src], [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then WITH_SPIDERMONKEY_SUBDIR="$WITH_JS_SUBDIR/src" - AC_DEFINE(HAVE_JSSTDDEF_H, 1, [Define to 1 if you have <jsstddef.h>]) AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'js' library (-ljs).]) + else + WITH_JS_SUBDIR=js fi ], []) AC_SUBST(WITH_SPIDERMONKEY_SUBDIR) +AC_SUBST(WITH_JS_SUBDIR) dnl # Lua WITH_LUA_SUBDIR_DEF="" @@ . patch -p0 <<'@@ .' Index: rpm/js/rpm-js.h ============================================================================ $ cvs diff -u -r1.2 -r1.2.2.1 rpm-js.h --- rpm/js/rpm-js.h 24 Apr 2009 20:34:20 -0000 1.2 +++ rpm/js/rpm-js.h 28 Feb 2010 00:23:41 -0000 1.2.2.1 @@ -34,4 +34,12 @@ #include "jsutil.h" /* Added by JSIFY */ #endif +#ifndef JS_FS +#define JS_FS(name,call,nargs,flags,extra) \ + {name, call, nargs, flags, extra} +#endif +#ifndef JS_FS_END +#define JS_FS_END JS_FS(NULL,NULL,0,0,0) +#endif + #endif /* H_RPM_JS */ @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmds-js.c ============================================================================ $ cvs diff -u -r1.12.2.3 -r1.12.2.4 rpmds-js.c --- rpm/js/rpmds-js.c 14 May 2009 00:10:20 -0000 1.12.2.3 +++ rpm/js/rpmds-js.c 28 Feb 2010 00:23:41 -0000 1.12.2.4 @@ -355,7 +355,7 @@ return NULL; } } else - if (OBJ_IS_ARRAY(cx, o)) { + if (JS_IsArrayObject(cx, o)) { jsuint length = 0; jsuint i; JSBool ok = JS_GetArrayLength(cx, o, &length); @@ . patch -p0 <<'@@ .' Index: rpm/js/rpmjsfile.c ============================================================================ $ cvs diff -u -r1.1.2.1 -r1.1.2.2 rpmjsfile.c --- rpm/js/rpmjsfile.c 8 May 2009 22:18:39 -0000 1.1.2.1 +++ rpm/js/rpmjsfile.c 28 Feb 2010 00:23:41 -0000 1.1.2.2 @@ -2230,7 +2230,11 @@ urlChars = js_InflateString(cx, url, &len); if (!urlChars) return JS_FALSE; +#if JS_VERSION < 180 + str = js_NewString(cx, urlChars, len, 0); +#else str = js_NewString(cx, urlChars, len); +#endif if (!str) { JS_free(cx, urlChars); return JS_FALSE; @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
