Hello community, here is the log from the commit of package cjs for openSUSE:Factory checked in at 2016-11-15 18:00:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cjs (Old) and /work/SRC/openSUSE:Factory/.cjs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cjs" Changes: -------- --- /work/SRC/openSUSE:Factory/cjs/cjs.changes 2016-05-13 09:24:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cjs.new/cjs.changes 2016-11-15 18:00:24.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 8 13:01:41 UTC 2016 - sor.ale...@meowr.ru + +- Update to version 3.2.0: + * Migrate away from gnome-common deprecated vars and macros. + * modules/GObject.js: Add access to handler_block and + handler_unblock. + * build: Require C++11. + * Fix build when extra debugging is enabled (util/log.h). +- Add the optional Gtk3 dependency. + +------------------------------------------------------------------- Old: ---- cjs-3.0.1.tar.gz New: ---- cjs-3.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cjs.spec ++++++ --- /var/tmp/diff_new_pack.7g7hlS/_old 2016-11-15 18:00:25.000000000 +0100 +++ /var/tmp/diff_new_pack.7g7hlS/_new 2016-11-15 18:00:25.000000000 +0100 @@ -20,7 +20,7 @@ %define sover 0 %define typelib typelib-1_0-CjsPrivate-1_0 Name: cjs -Version: 3.0.1 +Version: 3.2.0 Release: 0 Summary: JavaScript module used by Cinnamon License: MIT and (MPL-1.1 or GPL-2.0+ or LGPL-2.1+) @@ -28,12 +28,20 @@ Url: https://github.com/linuxmint/cjs Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf +BuildRequires: autoconf +BuildRequires: autoconf-archive +BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: gnome-common -BuildRequires: mozjs24-devel +BuildRequires: libtool +BuildRequires: pkgconfig BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.0 +BuildRequires: pkgconfig(libffi) +BuildRequires: pkgconfig(mozjs-24) %description JavaScript bindings based on GObject Introspection for the @@ -77,9 +85,9 @@ %setup -q %build -NOCONFIGURE=1 gnome-autogen.sh +NOCONFIGURE=1 ./autogen.sh %configure -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install %make_install ++++++ cjs-3.0.1.tar.gz -> cjs-3.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/Makefile.am new/cjs-3.2.0/Makefile.am --- old/cjs-3.0.1/Makefile.am 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/Makefile.am 2016-11-07 11:29:03.000000000 +0100 @@ -92,6 +92,7 @@ $(AM_CFLAGS) libcjs_la_LDFLAGS = \ $(EXTRA_LINK_FLAGS) \ + $(WARN_LDFLAGS) \ -export-symbols-regex "^[^_]" -version-info 0:0:0 \ -no-undefined \ -rdynamic @@ -217,7 +218,7 @@ $(JS_LIBS) \ $(GOBJECT_LIBS) \ libcjs.la -cjs_console_LDFLAGS = -rdynamic +cjs_console_LDFLAGS = $(WARN_LDFLAGS) -rdynamic cjs_console_SOURCES = cjs/console.cpp install-exec-hook: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/autogen.sh new/cjs-3.2.0/autogen.sh --- old/cjs-3.0.1/autogen.sh 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/autogen.sh 2016-11-07 11:29:03.000000000 +0100 @@ -1,44 +1,37 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +test -n "$srcdir" || srcdir=$(dirname "$0") +test -n "$srcdir" || srcdir=. -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. +olddir=$(pwd) -PKG_NAME="gjs" -REQUIRED_AUTOCONF_VERSION=2.53 -REQUIRED_AUTOMAKE_VERSION=1.7.2 - -(test -f $srcdir/configure.ac \ - && test -f $srcdir/autogen.sh) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" +cd $srcdir + +(test -f configure.ac) || { + echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" exit 1 } -DIE=0 +# shellcheck disable=SC2016 +PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac) -# This is a bit complicated here since we can't use gnome-config yet. -# It'll be easier after switching to pkg-config since we can then -# use pkg-config to find the gnome-autogen.sh script. - -gnome_autogen= -gnome_datadir= - -ifs_save="$IFS"; IFS=":" -for dir in $PATH ; do - test -z "$dir" && dir=. - if test -f $dir/gnome-autogen.sh ; then - gnome_autogen="$dir/gnome-autogen.sh" - gnome_datadir=`echo $dir | sed -e 's,/bin$,/share,'` - break - fi -done -IFS="$ifs_save" - -if test -z "$gnome_autogen" ; then - echo "You need to install the gnome-common module and make" - echo "sure the gnome-autogen.sh script is in your \$PATH." - exit 1 +if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then + echo "*** WARNING: I am going to run 'configure' with no arguments." >&2 + echo "*** If you wish to pass any to it, please specify them on the" >&2 + echo "*** '$0' command line." >&2 + echo "" >&2 fi -GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 . $gnome_autogen +aclocal --install || exit 1 +autoreconf --verbose --force --install || exit 1 + +cd "$olddir" +if [ "$NOCONFIGURE" = "" ]; then + $srcdir/configure "$@" || exit 1 + + if [ "$1" = "--help" ]; then exit 0 else + echo "Now type 'make' to compile $PKG_NAME" || exit 1 + fi +else + echo "Skipping configure process." +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/cjs/importer.cpp new/cjs-3.2.0/cjs/importer.cpp --- old/cjs-3.0.1/cjs/importer.cpp 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/cjs/importer.cpp 2016-11-07 11:29:03.000000000 +0100 @@ -893,7 +893,9 @@ goto out; priv = priv_from_js(context, *obj); - gjs_debug_jsprop(GJS_DEBUG_IMPORTER, "Resolve prop '%s' hook obj %p priv %p", name, *obj, priv); + gjs_debug_jsprop(GJS_DEBUG_IMPORTER, + "Resolve prop '%s' hook obj %p priv %p", + name, (void *)obj, priv); if (priv == NULL) /* we are the prototype, or have the wrong class */ goto out; JS_BeginRequest(context); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/configure.ac new/cjs-3.2.0/configure.ac --- old/cjs-3.0.1/configure.ac 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/configure.ac 2016-11-07 11:29:03.000000000 +0100 @@ -2,13 +2,17 @@ # Process this file with autoconf to produce a configure script. m4_define(pkg_major_version, 3) -m4_define(pkg_minor_version, 0) -m4_define(pkg_micro_version, 1) +m4_define(pkg_minor_version, 2) +m4_define(pkg_micro_version, 0) m4_define(pkg_version, pkg_major_version.pkg_minor_version.pkg_micro_version) m4_define(pkg_int_version, (pkg_major_version * 100 + pkg_minor_version) * 100 + pkg_micro_version) AC_PREREQ(2.61) AC_INIT([cjs], pkg_version, [https://github.com/linuxmint/cjs]) +AC_CONFIG_MACRO_DIR([m4]) + +m4_ifdef([AX_IS_RELEASE], [AX_IS_RELEASE([always])]) + AM_INIT_AUTOMAKE([dist-xz no-dist-gzip]) AC_CONFIG_SRCDIR([cjs/console.cpp]) AC_CONFIG_HEADER([config.h]) @@ -28,6 +32,7 @@ AC_PROG_CC AM_PROG_CC_C_O AC_PROG_CXX +AX_CXX_COMPILE_STDCXX_11 AC_ISC_POSIX AC_HEADER_STDC @@ -40,8 +45,8 @@ # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST -GNOME_CXX_WARNINGS([maximum]) -GNOME_MAINTAINER_MODE_DEFINES +m4_ifdef([AX_COMPILER_FLAGS], + [AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])]) # coverage AC_ARG_ENABLE([coverage], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/debian/changelog new/cjs-3.2.0/debian/changelog --- old/cjs-3.0.1/debian/changelog 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/debian/changelog 2016-11-07 11:29:03.000000000 +0100 @@ -1,3 +1,29 @@ +cjs (3.2.0) serena; urgency=medium + + [ Maximiliano Curia ] + * Migrate away from gnome-common deprecated vars and macros + + [ Michael Webster ] + * modules/GObject.js: Add access to handler_block and handler_unblock. + + [ Clement Lefebvre ] + * Fixed build + + [ Maximiliano Curia ] + * Make AX_ macros optional + * Drop glib-gettextize, gtkdocize and intltoolize + + [ leigh123linux ] + * build: Require C++11 + + [ Michael Webster ] + * Fix build when extra debugging is enabled (util/log.h) + + [ Clement Lefebvre ] + * pkg: Add missing autoconf-archive in debian/control.in + + -- Clement Lefebvre <r...@linuxmint.com> Mon, 07 Nov 2016 10:28:25 +0000 + cjs (3.0.1) sarah; urgency=medium [ Michael Webster ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/debian/control new/cjs-3.2.0/debian/control --- old/cjs-3.0.1/debian/control 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/debian/control 2016-11-07 11:29:03.000000000 +0100 @@ -12,6 +12,7 @@ gnome-pkg-tools, autotools-dev, dh-autoreconf, + autoconf-archive, pkg-config, libglib2.0-dev (>= 2.37.3), libgirepository1.0-dev (>= 1.33.10), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/debian/control.in new/cjs-3.2.0/debian/control.in --- old/cjs-3.0.1/debian/control.in 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/debian/control.in 2016-11-07 11:29:03.000000000 +0100 @@ -8,6 +8,7 @@ gnome-pkg-tools, autotools-dev, dh-autoreconf, + autoconf-archive, pkg-config, libglib2.0-dev (>= 2.37.3), libgirepository1.0-dev (>= 1.33.10), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/gi/boxed.cpp new/cjs-3.2.0/gi/boxed.cpp --- old/cjs-3.0.1/gi/boxed.cpp 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/gi/boxed.cpp 2016-11-07 11:29:03.000000000 +0100 @@ -133,7 +133,8 @@ return JS_TRUE; /* not resolved, but no error */ priv = priv_from_js(context, *obj); - gjs_debug_jsprop(GJS_DEBUG_GBOXED, "Resolve prop '%s' hook obj %p priv %p", name, *obj, priv); + gjs_debug_jsprop(GJS_DEBUG_GBOXED, "Resolve prop '%s' hook obj %p priv %p", + name, (void *)obj, priv); if (priv == NULL) goto out; /* wrong class */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/gi/function.cpp new/cjs-3.2.0/gi/function.cpp --- old/cjs-3.0.1/gi/function.cpp 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/gi/function.cpp 2016-11-07 11:29:03.000000000 +0100 @@ -1243,9 +1243,10 @@ jsval retval; priv = priv_from_js(context, callee); - gjs_debug_marshal(GJS_DEBUG_GFUNCTION, "Call callee %p priv %p this obj %p %s", callee, priv, - obj, JS_GetTypeName(context, - JS_TypeOfValue(context, OBJECT_TO_JSVAL(object)))); + gjs_debug_marshal(GJS_DEBUG_GFUNCTION, + "Call callee %p priv %p this obj %p %s", callee, priv, + object, + JS_GetTypeName(context, JS_TypeOfValue(context, OBJECT_TO_JSVAL(object)))); if (priv == NULL) return JS_TRUE; /* we are the prototype, or have the wrong class */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/gi/fundamental.cpp new/cjs-3.2.0/gi/fundamental.cpp --- old/cjs-3.0.1/gi/fundamental.cpp 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/gi/fundamental.cpp 2016-11-07 11:29:03.000000000 +0100 @@ -160,8 +160,8 @@ JS_SetPrivate(object, priv); gjs_debug_lifecycle(GJS_DEBUG_GFUNDAMENTAL, - "fundamental instance constructor, obj %p priv %p proto %p ", - object, priv, JS_GetPrototype (object)); + "fundamental instance constructor, obj %p priv %p", + object, priv); proto_priv = proto_priv_from_js(context, object); g_assert(proto_priv != NULL); @@ -348,7 +348,9 @@ return JS_TRUE; /* not resolved, but no error */ priv = priv_from_js(context, *obj); - gjs_debug_jsprop(GJS_DEBUG_GFUNDAMENTAL, "Resolve prop '%s' hook obj %p priv %p", name, *obj, priv); + gjs_debug_jsprop(GJS_DEBUG_GFUNDAMENTAL, + "Resolve prop '%s' hook obj %p priv %p", + name, (void *)obj, priv); if (priv == NULL) goto out; /* wrong class */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/gi/gerror.cpp new/cjs-3.2.0/gi/gerror.cpp --- old/cjs-3.0.1/gi/gerror.cpp 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/gi/gerror.cpp 2016-11-07 11:29:03.000000000 +0100 @@ -493,8 +493,8 @@ } gjs_debug_marshal(GJS_DEBUG_GBOXED, - "Wrapping struct %s %p with JSObject", - g_base_info_get_name((GIBaseInfo *)info), gboxed); + "Wrapping struct %s with JSObject", + g_base_info_get_name((GIBaseInfo *)info)); proto = gjs_lookup_generic_prototype(context, info); proto_priv = priv_from_js(context, proto); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/gi/ns.cpp new/cjs-3.2.0/gi/ns.cpp --- old/cjs-3.0.1/gi/ns.cpp 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/gi/ns.cpp 2016-11-07 11:29:03.000000000 +0100 @@ -81,7 +81,9 @@ } priv = priv_from_js(context, *obj); - gjs_debug_jsprop(GJS_DEBUG_GNAMESPACE, "Resolve prop '%s' hook obj %p priv %p", name, *obj, priv); + gjs_debug_jsprop(GJS_DEBUG_GNAMESPACE, + "Resolve prop '%s' hook obj %p priv %p", + name, (void *)obj, priv); if (priv == NULL) { ret = JS_TRUE; /* we are the prototype, or have the wrong class */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/gi/object.cpp new/cjs-3.2.0/gi/object.cpp --- old/cjs-3.0.1/gi/object.cpp 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/gi/object.cpp 2016-11-07 11:29:03.000000000 +0100 @@ -267,7 +267,8 @@ priv = priv_from_js(context, obj); gjs_debug_jsprop(GJS_DEBUG_GOBJECT, - "Get prop '%s' hook obj %p priv %p", name, obj, priv); + "Get prop '%s' hook obj %p priv %p", + name, (void *)obj, priv); if (priv == NULL) { /* If we reach this point, either object_instance_new_resolve @@ -335,7 +336,9 @@ priv = priv_from_js(context, obj); gjs_debug_jsprop(GJS_DEBUG_GOBJECT, - "Set prop '%s' hook obj %p priv %p", name, obj, priv); + "Set prop '%s' hook obj %p priv %p", + name, (void *)obj, priv); + if (priv == NULL) { /* see the comment in object_instance_get_prop() on this */ @@ -519,7 +522,7 @@ gjs_debug_jsprop(GJS_DEBUG_GOBJECT, "Resolve prop '%s' hook obj %p priv %p (%s.%s) gobj %p %s", name, - *obj, + (void *)obj, priv, priv && priv->info ? g_base_info_get_namespace (priv->info) : "", priv && priv->info ? g_base_info_get_name (priv->info) : "", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/gi/repo.cpp new/cjs-3.2.0/gi/repo.cpp --- old/cjs-3.0.1/gi/repo.cpp 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/gi/repo.cpp 2016-11-07 11:29:03.000000000 +0100 @@ -40,7 +40,6 @@ #include <cjs/compat.h> #include <cjs/jsapi-private.h> -#include <util/log.h> #include <util/misc.h> #include <girepository.h> @@ -203,7 +202,8 @@ goto out; priv = priv_from_js(context, *obj); - gjs_debug_jsprop(GJS_DEBUG_GREPO, "Resolve prop '%s' hook obj %p priv %p", name, obj, priv); + gjs_debug_jsprop(GJS_DEBUG_GREPO, "Resolve prop '%s' hook obj %p priv %p", + name, (void *)obj, priv); if (priv == NULL) /* we are the prototype, or have the wrong class */ goto out; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/gi/repo.h new/cjs-3.2.0/gi/repo.h --- old/cjs-3.0.1/gi/repo.h 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/gi/repo.h 2016-11-07 11:29:03.000000000 +0100 @@ -29,6 +29,7 @@ #include <girepository.h> #include <cjs/gjs-module.h> +#include <util/log.h> G_BEGIN_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/gi/union.cpp new/cjs-3.2.0/gi/union.cpp --- old/cjs-3.0.1/gi/union.cpp 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/gi/union.cpp 2016-11-07 11:29:03.000000000 +0100 @@ -79,7 +79,8 @@ return JS_TRUE; /* not resolved, but no error */ priv = priv_from_js(context, *obj); - gjs_debug_jsprop(GJS_DEBUG_GBOXED, "Resolve prop '%s' hook obj %p priv %p", name, *obj, priv); + gjs_debug_jsprop(GJS_DEBUG_GBOXED, "Resolve prop '%s' hook obj %p priv %p", + name, (void *)obj, priv); if (priv == NULL) { ret = JS_FALSE; /* wrong class */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cjs-3.0.1/modules/overrides/GObject.js new/cjs-3.2.0/modules/overrides/GObject.js --- old/cjs-3.0.1/modules/overrides/GObject.js 2016-05-10 17:26:47.000000000 +0200 +++ new/cjs-3.2.0/modules/overrides/GObject.js 2016-11-07 11:29:03.000000000 +0100 @@ -288,4 +288,14 @@ this.Object.prototype.disconnect = function(id) { return GObject.signal_handler_disconnect(this, id); }; + + this.Object.prototype.handler_block = function(id) { + return GObject.signal_handler_block(this, id); + }; + + this.Object.prototype.handler_unblock = function(id) { + return GObject.signal_handler_unblock(this, id); + }; } + +
