cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gjs-1.32.0.

Browse Source 
ok jasper@
This commit is contained in:
ajacoutot 2012-04-07 13:48:31 +00:00
parent 191bc6db26
commit b8eda1b31b
5 changed files with 30 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
x11/gnome/gjs/Makefile
View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.9 2012/01/16 11:17:14 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2012/04/07 13:48:31 ajacoutot Exp $
COMMENT= Javascript bindings for GNOME
GNOME_PROJECT= gjs
GNOME_VERSION= 1.30.1
GNOME_VERSION= 1.32.0
SHARED_LIBS += gjs 1.0 # 0.0
SHARED_LIBS += gjs-dbus 1.0 # 0.0
SHARED_LIBS += gjs-gdbus 1.0 # 0.0
SHARED_LIBS += gjs-gdbus 1.0 # 0.0
CATEGORIES= devel
@ -21,6 +21,14 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm
WANTLIB += c cairo cairo-gobject dbus-1 dbus-glib-1 drm expat
WANTLIB += ffi fontconfig freetype gio-2.0 girepository-1.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 m mozjs185 ncurses
WANTLIB += ncursesw nspr4 pcre pixman-1 plc4 plds4 png pthread
WANTLIB += pthread-stubs readline stdc++ xcb xcb-render xcb-shm
WANTLIB += z
MODULES= devel/gettext \
lang/python \
x11/gnome
@ -31,23 +39,10 @@ MODPY_ADJ_FILES= scripts/make-tests
LIBTOOL_FLAGS= --tag=disable-static
WANTLIB += GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm
WANTLIB += c cairo cairo-gobject dbus-1 dbus-glib-1 drm expat
WANTLIB += ffi fontconfig freetype gio-2.0 girepository-1.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 m mozjs ncurses
WANTLIB += ncursesw nspr4 pcre pixman-1 plc4 plds4 png pthread
WANTLIB += pthread-stubs readline stdc++ xcb xcb-render xcb-shm
WANTLIB += z
LIB_DEPENDS= devel/gobject-introspection>=1.30.0 \
lang/spidermonkey \
LIB_DEPENDS= devel/gobject-introspection>=1.32.0 \
devel/spidermonkey>=1.8,<1.9 \
x11/dbus-glib
REGRESS_DEPENDS= sysutils/e2fsprogs
CONFIGURE_ARGS+= --with-js-package="mozilla-js"
pre-configure:
@perl -pi -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/configure
REGRESS_DEPENDS= sysutils/e2fsprogs # uuidgen(1)
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gjs/

10
x11/gnome/gjs/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/gjs-1.30.1.tar.xz) = f4hCrqKYoDPwyNclJ44eUA==
RMD160 (gnome/gjs-1.30.1.tar.xz) = EKRCYcuAGi2OrLB1rdwpZHaVPzo=
SHA1 (gnome/gjs-1.30.1.tar.xz) = JpeWlEdCuz+Gu+AXYgpl8v6lAgc=
SHA256 (gnome/gjs-1.30.1.tar.xz) = 9dsH3fcEWKM6XQvfg/hAcPwjQjfssNSahnbme1IRmgU=
SIZE (gnome/gjs-1.30.1.tar.xz) = 455456
MD5 (gnome/gjs-1.32.0.tar.xz) = p3/g7bb2gUNNg2DGLkcavw==
RMD160 (gnome/gjs-1.32.0.tar.xz) = l36gjFfLmcWXzPSbmU9MMfjgdFg=
SHA1 (gnome/gjs-1.32.0.tar.xz) = fqnCu870D2XA56oE5vLfjFU1Fu4=
SHA256 (gnome/gjs-1.32.0.tar.xz) = ufHcFWwVgGgkyTa7CN3FBI9S9pIWVBRsRwJaYkVxCMA=
SIZE (gnome/gjs-1.32.0.tar.xz) = 464372

11
x11/gnome/gjs/patches/patch-configure
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-configure,v 1.2 2011/09/21 14:00:19 jasper Exp $
--- configure.orig Wed Sep 21 01:07:22 2011
+++ configure Wed Sep 21 01:07:33 2011
@@ -15983,6 +15983,7 @@ fi
## some flavors of Firefox .pc only set sdkdir, not libdir
FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE`
FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE`
+ FIREFOX_JS_LIBDIR="${LOCALBASE}/lib"
## Ubuntu does not set libdir in mozilla-js.pc
if test x"$FIREFOX_JS_LIBDIR" = x; then

30
x11/gnome/gjs/patches/patch-gi_object_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-gi_object_c,v 1.3 2012/01/16 11:17:14 ajacoutot Exp $
Revert 72bc4307860a315f9d2173d700582add938d79a0
as our spidermonkey port does not have JS_updateMallocCounter().
https://bugzilla.gnome.org/show_bug.cgi?id=660431
--- gi/object.c.orig Fri Jan 13 22:31:51 2012
+++ gi/object.c Mon Jan 16 12:08:48 2012
@@ -674,7 +674,9 @@ GJS_NATIVE_CONSTRUCTOR_DECLARE(object_instance)
if (unthreadsafe_template_for_constructor.gobj == NULL) {
GParameter *params;
int n_params;
+#ifdef JS_updateMallocCounter
GTypeQuery query;
+#endif
JSObject *old_jsobj;
gtype = g_registered_type_info_get_g_type( (GIRegisteredTypeInfo*) priv->info);
@@ -711,8 +713,10 @@ GJS_NATIVE_CONSTRUCTOR_DECLARE(object_instance)
goto out;
}
+#ifdef JS_updateMallocCounter
g_type_query(gtype, &query);
JS_updateMallocCounter(context, query.instance_size);
+#endif
if (G_IS_INITIALLY_UNOWNED(priv->gobj) &&
!g_object_is_floating(priv->gobj)) {

18
x11/gnome/gjs/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2011/09/21 14:00:19 jasper Exp $
@comment $OpenBSD: PLIST,v 1.3 2012/04/07 13:48:31 ajacoutot Exp $
bin/gjs
@bin bin/gjs-console
include/gjs-1.0/
@ -9,6 +9,8 @@ include/gjs-1.0/gi/closure.h
include/gjs-1.0/gi/enumeration.h
include/gjs-1.0/gi/foreign.h
include/gjs-1.0/gi/function.h
include/gjs-1.0/gi/gtype.h
include/gjs-1.0/gi/interface.h
include/gjs-1.0/gi/keep-alive.h
include/gjs-1.0/gi/ns.h
include/gjs-1.0/gi/object.h
@ -29,7 +31,7 @@ include/gjs-1.0/gjs/importer.h
include/gjs-1.0/gjs/jsapi-util.h
include/gjs-1.0/gjs/mem.h
include/gjs-1.0/gjs/native.h
lib/gjs/
lib/girepository-1.0/GjsDBus-1.0.typelib
lib/gjs-1.0/
@comment lib/gjs-1.0/cairoNative.la
lib/gjs-1.0/cairoNative.so
@ -45,13 +47,13 @@ lib/gjs-1.0/gettextNative.so
lib/gjs-1.0/langNative.so
@comment lib/gjs-1.0/mainloop.la
lib/gjs-1.0/mainloop.so
lib/gjs/GjsDBus-1.0.gir
lib/gjs/GjsDBus-1.0.typelib
@comment lib/libgjs-dbus.la
@comment lib/gjs-1.0/system.la
lib/gjs-1.0/system.so
lib/libgjs-dbus.la
@lib lib/libgjs-dbus.so.${LIBgjs-dbus_VERSION}
@comment lib/libgjs-gdbus.la
lib/libgjs-gdbus.la
@lib lib/libgjs-gdbus.so.${LIBgjs-gdbus_VERSION}
@comment lib/libgjs.la
lib/libgjs.la
@lib lib/libgjs.so.${LIBgjs_VERSION}
lib/pkgconfig/gjs-1.0.pc
lib/pkgconfig/gjs-dbus-1.0.pc
@ -62,6 +64,7 @@ share/examples/gjs/gio-cat.js
share/examples/gjs/gtk.js
share/examples/gjs/http-server.js
share/examples/gjs/test.jpg
share/gir-1.0/GjsDBus-1.0.gir
share/gjs-1.0/
share/gjs-1.0/cairo.js
share/gjs-1.0/dbus.js
@ -70,6 +73,7 @@ share/gjs-1.0/jsUnit.js
share/gjs-1.0/lang.js
share/gjs-1.0/overrides/
share/gjs-1.0/overrides/GLib.js
share/gjs-1.0/overrides/GObject.js
share/gjs-1.0/overrides/Gio.js
share/gjs-1.0/promise.js
share/gjs-1.0/signals.js