Hello community, here is the log from the commit of package gjs for openSUSE:Factory checked in at Fri Sep 24 00:42:56 CEST 2010. -------- --- GNOME/gjs/gjs.changes 2010-07-23 09:18:07.000000000 +0200 +++ /mounts/work_src_done/STABLE/gjs/gjs.changes 2010-09-17 17:32:34.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Sep 16 09:50:52 CEST 2010 - vuntz@opensuse.org + +- Update to version 0.7.2: + + Fix 64 bit issues. + + Explicitly link gjs-console against glib. + + Update to (and require) gobject-introspection 0.9.5. + + Various other fixes. +- Remove gir-repository Recommends: all the interesting gir files + are now directly shipped with the libraries. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gjs-0.7.1.tar.bz2 New: ---- gjs-0.7.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gjs.spec ++++++ --- /var/tmp/diff_new_pack.1W0yPL/_old 2010-09-24 00:42:37.000000000 +0200 +++ /var/tmp/diff_new_pack.1W0yPL/_new 2010-09-24 00:42:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gjs (Version 0.7.1) +# spec file for package gjs (Version 0.7.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,7 +27,7 @@ %endif Name: gjs -Version: 0.7.1 +Version: 0.7.2 Release: 1 # FIXME: find out if tapsets should really be in devel package or in main package License: MIT License (or similar) @@ -46,7 +46,6 @@ BuildRequires: readline-devel BuildRequires: systemtap-sdt-devel Requires: libgjs-0 = %{version} -Recommends: gir-repository BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ gjs-0.7.1.tar.bz2 -> gjs-0.7.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/INSTALL new/gjs-0.7.2/INSTALL --- old/gjs-0.7.1/INSTALL 2009-12-03 22:51:49.000000000 +0100 +++ new/gjs-0.7.2/INSTALL 2010-09-15 23:19:52.000000000 +0200 @@ -4,8 +4,10 @@ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -288,7 +351,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/Makefile-gi.am new/gjs-0.7.2/Makefile-gi.am --- old/gjs-0.7.1/Makefile-gi.am 2010-06-24 23:54:19.000000000 +0200 +++ new/gjs-0.7.2/Makefile-gi.am 2010-09-15 23:18:21.000000000 +0200 @@ -49,6 +49,7 @@ $(DTRACE) -G -s $< -o $@ BUILT_SOURCES += gjs_gi_probes.h gjs_gi_probes.o libgjs_gi_la_LIBADD += gjs_gi_probes.o +EXTRA_DIST += gi/gjs_gi_probes.d endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/Makefile-test.am new/gjs-0.7.2/Makefile-test.am --- old/gjs-0.7.1/Makefile-test.am 2010-06-24 23:54:19.000000000 +0200 +++ new/gjs-0.7.2/Makefile-test.am 2010-09-15 23:24:41.000000000 +0200 @@ -62,6 +62,41 @@ EXTRA_DIST += \ scripts/make-tests +# noinst_ always builds a static library +testlib_LTLIBRARIES = libregress.la libgimarshallingtests.la +testlibdir = $(prefix)/unused +install-testlibLTLIBRARIES: # prevent it from being installed + +nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h +libregress_la_CFLAGS = $(GJS_CFLAGS) $(GJS_CAIRO_CFLAGS) +libregress_la_LDFLAGS = -avoid-version $(GJS_LIBS) $(GJS_CAIRO_LIBS) +nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h +libgimarshallingtests_la_CFLAGS = $(GJS_CFLAGS) +libgimarshallingtests_la_LDFLAGS = -avoid-version $(GJS_LIBS) + +# g-i doesn't ship these as shared libraries anymore; we build them here +Regress-1.0.gir: libregress.la Makefile + $(AM_V_GEN) g-ir-scanner --include=cairo-1.0 --include=Gio-2.0 \ + --namespace=Regress --nsversion=1.0 \ + --warn-all --warn-error \ + --library=libregress.la \ + --libtool="$(top_builddir)/libtool" \ + --output $@ \ + $(libregress_la_SOURCES) +Regress-1.0.typelib: Regress-1.0.gir Makefile + $(AM_V_GEN) g-ir-compiler $< -o $@ + +GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile + $(AM_V_GEN) g-ir-scanner --include=Gio-2.0 \ + --namespace=GIMarshallingTests --nsversion=1.0 --symbol-prefix=gi_marshalling_tests \ + --warn-all --warn-error \ + --library=libgimarshallingtests.la \ + --libtool="$(top_builddir)/libtool" \ + --output $@ \ + $(libgimarshallingtests_la_SOURCES) +GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile + $(AM_V_GEN) g-ir-compiler $< -o $@ + ######################################################################## TESTS_ENVIRONMENT = \ TOP_SRCDIR=$(top_srcdir) \ @@ -70,10 +105,11 @@ GJS_DEBUG_OUTPUT=test_user_data/logs/gjs.log \ BUILDDIR=. \ GJS_USE_UNINSTALLED_FILES=1 \ + GI_TYPELIB_PATH=$(builddir) \ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(FIREFOX_JS_LIBDIR)" \ G_FILENAME_ENCODING=latin1 # ensure filenames are not utf8 -test: $(gjsnative_LTLIBRARIES) ${TEST_PROGS} +test: $(gjsnative_LTLIBRARIES) ${TEST_PROGS} Regress-1.0.typelib GIMarshallingTests-1.0.typelib @test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS} ${TEST_PROGS_OPTIONS} check: test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/Makefile.am new/gjs-0.7.2/Makefile.am --- old/gjs-0.7.1/Makefile.am 2010-06-24 23:54:19.000000000 +0200 +++ new/gjs-0.7.2/Makefile.am 2010-08-20 15:35:46.000000000 +0200 @@ -113,6 +113,7 @@ $(AM_CFLAGS) \ $(GJS_CFLAGS) gjs_console_LDADD = \ + $(GJS_LIBS) \ libgjs.la gjs_console_LDFLAGS = -R $(FIREFOX_JS_LIBDIR) -rdynamic gjs_console_SOURCES = gjs/console.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/Makefile.in new/gjs-0.7.2/Makefile.in --- old/gjs-0.7.1/Makefile.in 2010-07-12 19:56:26.000000000 +0200 +++ new/gjs-0.7.2/Makefile.in 2010-09-15 23:29:45.000000000 +0200 @@ -54,6 +54,7 @@ missing @ENABLE_DTRACE_TRUE@am__append_2 = gjs_gi_probes.h gjs_gi_probes.o @ENABLE_DTRACE_TRUE@am__append_3 = gjs_gi_probes.o +@ENABLE_DTRACE_TRUE@am__append_4 = gi/gjs_gi_probes.d subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -87,12 +88,13 @@ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(gjsnativedir)" "$(DESTDIR)$(libdir)" \ - "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gjsjsdir)" \ - "$(DESTDIR)$(gjstweenerdir)" "$(DESTDIR)$(pkgconfigdir)" \ - "$(DESTDIR)$(tapsetdir)" "$(DESTDIR)$(gjs_dbusheaderdir)" \ + "$(DESTDIR)$(testlibdir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(gjsjsdir)" "$(DESTDIR)$(gjstweenerdir)" \ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(tapsetdir)" \ + "$(DESTDIR)$(gjs_dbusheaderdir)" \ "$(DESTDIR)$(gjsgiincludedir)" "$(DESTDIR)$(gjsincludedir)" LTLIBRARIES = $(gjsnative_LTLIBRARIES) $(lib_LTLIBRARIES) \ - $(noinst_LTLIBRARIES) + $(noinst_LTLIBRARIES) $(testlib_LTLIBRARIES) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = libgjs.la $(am__DEPENDENCIES_1) cairoNative_la_DEPENDENCIES = libgjs-gi.la $(am__DEPENDENCIES_2) \ @@ -152,6 +154,15 @@ langNative_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(langNative_la_CFLAGS) \ $(CFLAGS) $(langNative_la_LDFLAGS) $(LDFLAGS) -o $@ +libgimarshallingtests_la_LIBADD = +nodist_libgimarshallingtests_la_OBJECTS = \ + libgimarshallingtests_la-gimarshallingtests.lo +libgimarshallingtests_la_OBJECTS = \ + $(nodist_libgimarshallingtests_la_OBJECTS) +libgimarshallingtests_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libgimarshallingtests_la_CFLAGS) $(CFLAGS) \ + $(libgimarshallingtests_la_LDFLAGS) $(LDFLAGS) -o $@ libgjs_dbus_la_DEPENDENCIES = libgjs.la $(am__DEPENDENCIES_1) am_libgjs_dbus_la_OBJECTS = libgjs_dbus_la-dbus.lo \ libgjs_dbus_la-dbus-signals.lo libgjs_dbus_la-dbus-proxy.lo @@ -184,6 +195,12 @@ libgjs_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(libgjs_la_LDFLAGS) $(LDFLAGS) -o $@ +libregress_la_LIBADD = +nodist_libregress_la_OBJECTS = libregress_la-regress.lo +libregress_la_OBJECTS = $(nodist_libregress_la_OBJECTS) +libregress_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libregress_la_CFLAGS) \ + $(CFLAGS) $(libregress_la_LDFLAGS) $(LDFLAGS) -o $@ mainloop_la_DEPENDENCIES = libgjs-gi.la $(am__DEPENDENCIES_2) am_mainloop_la_OBJECTS = mainloop_la-mainloop.lo mainloop_la_OBJECTS = $(am_mainloop_la_OBJECTS) @@ -194,7 +211,7 @@ PROGRAMS = $(bin_PROGRAMS) am_gjs_console_OBJECTS = gjs_console-console.$(OBJEXT) gjs_console_OBJECTS = $(am_gjs_console_OBJECTS) -gjs_console_DEPENDENCIES = libgjs.la +gjs_console_DEPENDENCIES = $(am__DEPENDENCIES_1) libgjs.la gjs_console_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(gjs_console_CFLAGS) \ $(CFLAGS) $(gjs_console_LDFLAGS) $(LDFLAGS) -o $@ @@ -241,8 +258,10 @@ SOURCES = $(cairoNative_la_SOURCES) $(console_la_SOURCES) \ $(dbusNative_la_SOURCES) $(debugger_la_SOURCES) \ $(gettextNative_la_SOURCES) $(gi_la_SOURCES) \ - $(langNative_la_SOURCES) $(libgjs_dbus_la_SOURCES) \ - $(libgjs_gi_la_SOURCES) $(libgjs_la_SOURCES) \ + $(langNative_la_SOURCES) \ + $(nodist_libgimarshallingtests_la_SOURCES) \ + $(libgjs_dbus_la_SOURCES) $(libgjs_gi_la_SOURCES) \ + $(libgjs_la_SOURCES) $(nodist_libregress_la_SOURCES) \ $(mainloop_la_SOURCES) $(gjs_console_SOURCES) \ $(gjs_tests_SOURCES) $(nodist_gjs_tests_SOURCES) \ $(gjs_unit_SOURCES) @@ -301,6 +320,7 @@ FIREFOX_JS_LIBDIR = @FIREFOX_JS_LIBDIR@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GI_DATADIR = @GI_DATADIR@ GJSTESTS_CFLAGS = @GJSTESTS_CFLAGS@ GJSTESTS_LIBS = @GJSTESTS_LIBS@ GJS_CAIRO_CFLAGS = @GJS_CAIRO_CFLAGS@ @@ -430,10 +450,11 @@ gjstest.h.stamp $(TEST_PROGS:%=valgrind.%.log) \ uninstalled-test-bus.conf uninstalled-system-test-bus.conf EXTRA_DIST = gjs-1.0.pc.in $(am__append_1) gjs-dbus-1.0.pc.in \ - gjs-gi-1.0.pc.in examples/clutter.js examples/gio-cat.js \ - examples/gtk.js examples/http-server.js examples/test.jpg \ - scripts/make-tests test/js/modules/alwaysThrows.js \ - test/js/modules/foobar.js test/js/modules/mutualImport/a.js \ + $(am__append_4) gjs-gi-1.0.pc.in examples/clutter.js \ + examples/gio-cat.js examples/gtk.js examples/http-server.js \ + examples/test.jpg scripts/make-tests \ + test/js/modules/alwaysThrows.js test/js/modules/foobar.js \ + test/js/modules/mutualImport/a.js \ test/js/modules/mutualImport/b.js \ test/js/modules/subA/.secret.js \ test/js/modules/subA/.hidden/hidden.js \ @@ -744,6 +765,7 @@ $(GJS_CFLAGS) gjs_console_LDADD = \ + $(GJS_LIBS) \ libgjs.la gjs_console_LDFLAGS = -R $(FIREFOX_JS_LIBDIR) -rdynamic @@ -785,6 +807,16 @@ test/gjs-unit.c +# noinst_ always builds a static library +testlib_LTLIBRARIES = libregress.la libgimarshallingtests.la +testlibdir = $(prefix)/unused +nodist_libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regress.h +libregress_la_CFLAGS = $(GJS_CFLAGS) $(GJS_CAIRO_CFLAGS) +libregress_la_LDFLAGS = -avoid-version $(GJS_LIBS) $(GJS_CAIRO_LIBS) +nodist_libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h +libgimarshallingtests_la_CFLAGS = $(GJS_CFLAGS) +libgimarshallingtests_la_LDFLAGS = -avoid-version $(GJS_LIBS) + ######################################################################## TESTS_ENVIRONMENT = \ TOP_SRCDIR=$(top_srcdir) \ @@ -793,6 +825,7 @@ GJS_DEBUG_OUTPUT=test_user_data/logs/gjs.log \ BUILDDIR=. \ GJS_USE_UNINSTALLED_FILES=1 \ + GI_TYPELIB_PATH=$(builddir) \ LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(FIREFOX_JS_LIBDIR)" \ G_FILENAME_ENCODING=latin1 # ensure filenames are not utf8 @@ -929,6 +962,24 @@ echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done + +uninstall-testlibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(testlib_LTLIBRARIES)'; test -n "$(testlibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(testlibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(testlibdir)/$$f"; \ + done + +clean-testlibLTLIBRARIES: + -test -z "$(testlib_LTLIBRARIES)" || rm -f $(testlib_LTLIBRARIES) + @list='$(testlib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done cairoNative.la: $(cairoNative_la_OBJECTS) $(cairoNative_la_DEPENDENCIES) $(cairoNative_la_LINK) -rpath $(gjsnativedir) $(cairoNative_la_OBJECTS) $(cairoNative_la_LIBADD) $(LIBS) console.la: $(console_la_OBJECTS) $(console_la_DEPENDENCIES) @@ -943,12 +994,16 @@ $(gi_la_LINK) -rpath $(gjsnativedir) $(gi_la_OBJECTS) $(gi_la_LIBADD) $(LIBS) langNative.la: $(langNative_la_OBJECTS) $(langNative_la_DEPENDENCIES) $(langNative_la_LINK) -rpath $(gjsnativedir) $(langNative_la_OBJECTS) $(langNative_la_LIBADD) $(LIBS) +libgimarshallingtests.la: $(libgimarshallingtests_la_OBJECTS) $(libgimarshallingtests_la_DEPENDENCIES) + $(libgimarshallingtests_la_LINK) -rpath $(testlibdir) $(libgimarshallingtests_la_OBJECTS) $(libgimarshallingtests_la_LIBADD) $(LIBS) libgjs-dbus.la: $(libgjs_dbus_la_OBJECTS) $(libgjs_dbus_la_DEPENDENCIES) $(libgjs_dbus_la_LINK) -rpath $(libdir) $(libgjs_dbus_la_OBJECTS) $(libgjs_dbus_la_LIBADD) $(LIBS) libgjs-gi.la: $(libgjs_gi_la_OBJECTS) $(libgjs_gi_la_DEPENDENCIES) $(libgjs_gi_la_LINK) -rpath $(libdir) $(libgjs_gi_la_OBJECTS) $(libgjs_gi_la_LIBADD) $(LIBS) libgjs.la: $(libgjs_la_OBJECTS) $(libgjs_la_DEPENDENCIES) $(libgjs_la_LINK) -rpath $(libdir) $(libgjs_la_OBJECTS) $(libgjs_la_LIBADD) $(LIBS) +libregress.la: $(libregress_la_OBJECTS) $(libregress_la_DEPENDENCIES) + $(libregress_la_LINK) -rpath $(testlibdir) $(libregress_la_OBJECTS) $(libregress_la_LIBADD) $(LIBS) mainloop.la: $(mainloop_la_OBJECTS) $(mainloop_la_DEPENDENCIES) $(mainloop_la_LINK) -rpath $(gjsnativedir) $(mainloop_la_OBJECTS) $(mainloop_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@ -1050,6 +1105,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gjs_tests-stack.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gjs_unit-gjs-unit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/langNative_la-lang.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgimarshallingtests_la-gimarshallingtests.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgjs_dbus_la-dbus-proxy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgjs_dbus_la-dbus-signals.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgjs_dbus_la-dbus.Plo@am__quote@ @@ -1083,6 +1139,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgjs_la-native.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgjs_la-profiler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgjs_la-stack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libregress_la-regress.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mainloop_la-mainloop.Plo@am__quote@ .c.o: @@ -1260,6 +1317,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(langNative_la_CFLAGS) $(CFLAGS) -c -o langNative_la-lang.lo `test -f 'modules/lang.c' || echo '$(srcdir)/'`modules/lang.c +libgimarshallingtests_la-gimarshallingtests.lo: $(GI_DATADIR)/tests/gimarshallingtests.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgimarshallingtests_la_CFLAGS) $(CFLAGS) -MT libgimarshallingtests_la-gimarshallingtests.lo -MD -MP -MF $(DEPDIR)/libgimarshallingtests_la-gimarshallingtests.Tpo -c -o libgimarshallingtests_la-gimarshallingtests.lo `test -f '$(GI_DATADIR)/tests/gimarshallingtests.c' || echo '$(srcdir)/'`$(GI_DATADIR)/tests/gimarshallingtests.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgimarshallingtests_la-gimarshallingtests.Tpo $(DEPDIR)/libgimarshallingtests_la-gimarshallingtests.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(GI_DATADIR)/tests/gimarshallingtests.c' object='libgimarshallingtests_la-gimarshallingtests.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgimarshallingtests_la_CFLAGS) $(CFLAGS) -c -o libgimarshallingtests_la-gimarshallingtests.lo `test -f '$(GI_DATADIR)/tests/gimarshallingtests.c' || echo '$(srcdir)/'`$(GI_DATADIR)/tests/gimarshallingtests.c + libgjs_dbus_la-dbus.lo: gjs-dbus/dbus.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgjs_dbus_la_CPPFLAGS) $(CPPFLAGS) $(libgjs_dbus_la_CFLAGS) $(CFLAGS) -MT libgjs_dbus_la-dbus.lo -MD -MP -MF $(DEPDIR)/libgjs_dbus_la-dbus.Tpo -c -o libgjs_dbus_la-dbus.lo `test -f 'gjs-dbus/dbus.c' || echo '$(srcdir)/'`gjs-dbus/dbus.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libgjs_dbus_la-dbus.Tpo $(DEPDIR)/libgjs_dbus_la-dbus.Plo @@ -1484,6 +1548,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgjs_la_CPPFLAGS) $(CPPFLAGS) $(libgjs_la_CFLAGS) $(CFLAGS) -c -o libgjs_la-misc.lo `test -f 'util/misc.c' || echo '$(srcdir)/'`util/misc.c +libregress_la-regress.lo: $(GI_DATADIR)/tests/regress.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -MT libregress_la-regress.lo -MD -MP -MF $(DEPDIR)/libregress_la-regress.Tpo -c -o libregress_la-regress.lo `test -f '$(GI_DATADIR)/tests/regress.c' || echo '$(srcdir)/'`$(GI_DATADIR)/tests/regress.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libregress_la-regress.Tpo $(DEPDIR)/libregress_la-regress.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(GI_DATADIR)/tests/regress.c' object='libregress_la-regress.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libregress_la_CFLAGS) $(CFLAGS) -c -o libregress_la-regress.lo `test -f '$(GI_DATADIR)/tests/regress.c' || echo '$(srcdir)/'`$(GI_DATADIR)/tests/regress.c + mainloop_la-mainloop.lo: modules/mainloop.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mainloop_la_CFLAGS) $(CFLAGS) -MT mainloop_la-mainloop.lo -MD -MP -MF $(DEPDIR)/mainloop_la-mainloop.Tpo -c -o mainloop_la-mainloop.lo `test -f 'modules/mainloop.c' || echo '$(srcdir)/'`modules/mainloop.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mainloop_la-mainloop.Tpo $(DEPDIR)/mainloop_la-mainloop.Plo @@ -2008,7 +2079,7 @@ install-binPROGRAMS: install-libLTLIBRARIES installdirs: - for dir in "$(DESTDIR)$(gjsnativedir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gjsjsdir)" "$(DESTDIR)$(gjstweenerdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(tapsetdir)" "$(DESTDIR)$(gjs_dbusheaderdir)" "$(DESTDIR)$(gjsgiincludedir)" "$(DESTDIR)$(gjsincludedir)"; do \ + for dir in "$(DESTDIR)$(gjsnativedir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(testlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gjsjsdir)" "$(DESTDIR)$(gjstweenerdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(tapsetdir)" "$(DESTDIR)$(gjs_dbusheaderdir)" "$(DESTDIR)$(gjsgiincludedir)" "$(DESTDIR)$(gjsincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -2043,7 +2114,8 @@ clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-gjsnativeLTLIBRARIES clean-libLTLIBRARIES clean-libtool \ - clean-local clean-noinstLTLIBRARIES mostlyclean-am + clean-local clean-noinstLTLIBRARIES clean-testlibLTLIBRARIES \ + mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -2068,7 +2140,7 @@ install-gjs_dbusheaderHEADERS install-gjsnativeLTLIBRARIES \ install-nobase_gjsgiincludeHEADERS \ install-nobase_gjsincludeHEADERS install-pkgconfigDATA \ - install-tapsetDATA + install-tapsetDATA install-testlibLTLIBRARIES install-dvi: install-dvi-am @@ -2122,7 +2194,7 @@ uninstall-gjsnativeLTLIBRARIES uninstall-libLTLIBRARIES \ uninstall-nobase_gjsgiincludeHEADERS \ uninstall-nobase_gjsincludeHEADERS uninstall-pkgconfigDATA \ - uninstall-tapsetDATA + uninstall-tapsetDATA uninstall-testlibLTLIBRARIES .MAKE: all check check-am install install-am install-exec-am \ install-strip @@ -2130,31 +2202,32 @@ .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ clean-binPROGRAMS clean-checkPROGRAMS clean-generic \ clean-gjsnativeLTLIBRARIES clean-libLTLIBRARIES clean-libtool \ - clean-local clean-noinstLTLIBRARIES ctags dist dist-all \ - dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dist_gjsjsDATA install-dist_gjstweenerDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-hook \ + clean-local clean-noinstLTLIBRARIES clean-testlibLTLIBRARIES \ + ctags dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-binPROGRAMS install-data \ + install-data-am install-dist_gjsjsDATA \ + install-dist_gjstweenerDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook \ install-gjs_dbusheaderHEADERS install-gjsnativeLTLIBRARIES \ install-html install-html-am install-info install-info-am \ install-libLTLIBRARIES install-man \ install-nobase_gjsgiincludeHEADERS \ install-nobase_gjsincludeHEADERS install-pdf install-pdf-am \ install-pkgconfigDATA install-ps install-ps-am install-strip \ - install-tapsetDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-dist_gjsjsDATA \ - uninstall-dist_gjstweenerDATA uninstall-gjs_dbusheaderHEADERS \ - uninstall-gjsnativeLTLIBRARIES uninstall-libLTLIBRARIES \ - uninstall-nobase_gjsgiincludeHEADERS \ + install-tapsetDATA install-testlibLTLIBRARIES installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-dist_gjsjsDATA uninstall-dist_gjstweenerDATA \ + uninstall-gjs_dbusheaderHEADERS uninstall-gjsnativeLTLIBRARIES \ + uninstall-libLTLIBRARIES uninstall-nobase_gjsgiincludeHEADERS \ uninstall-nobase_gjsincludeHEADERS uninstall-pkgconfigDATA \ - uninstall-tapsetDATA + uninstall-tapsetDATA uninstall-testlibLTLIBRARIES @ENABLE_SYSTEMTAP_TRUE@gjs/gjs.stp: gjs/gjs.stp.in Makefile @@ -2173,8 +2246,32 @@ gjstest.h gjstest.c : gjstest.h.stamp @true +install-testlibLTLIBRARIES: # prevent it from being installed + +# g-i doesn't ship these as shared libraries anymore; we build them here +Regress-1.0.gir: libregress.la Makefile + $(AM_V_GEN) g-ir-scanner --include=cairo-1.0 --include=Gio-2.0 \ + --namespace=Regress --nsversion=1.0 \ + --warn-all --warn-error \ + --library=libregress.la \ + --libtool="$(top_builddir)/libtool" \ + --output $@ \ + $(libregress_la_SOURCES) +Regress-1.0.typelib: Regress-1.0.gir Makefile + $(AM_V_GEN) g-ir-compiler $< -o $@ + +GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile + $(AM_V_GEN) g-ir-scanner --include=Gio-2.0 \ + --namespace=GIMarshallingTests --nsversion=1.0 --symbol-prefix=gi_marshalling_tests \ + --warn-all --warn-error \ + --library=libgimarshallingtests.la \ + --libtool="$(top_builddir)/libtool" \ + --output $@ \ + $(libgimarshallingtests_la_SOURCES) +GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile + $(AM_V_GEN) g-ir-compiler $< -o $@ -test: $(gjsnative_LTLIBRARIES) ${TEST_PROGS} +test: $(gjsnative_LTLIBRARIES) ${TEST_PROGS} Regress-1.0.typelib GIMarshallingTests-1.0.typelib @test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS} ${TEST_PROGS_OPTIONS} check: test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/configure new/gjs-0.7.2/configure --- old/gjs-0.7.1/configure 2010-07-12 19:56:30.000000000 +0200 +++ new/gjs-0.7.2/configure 2010-09-15 23:29:46.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.66 for gjs 0.7.1. +# Generated by GNU Autoconf 2.66 for gjs 0.7.2. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gjs>. # @@ -563,8 +563,8 @@ # Identity of this package. PACKAGE_NAME='gjs' PACKAGE_TARNAME='gjs' -PACKAGE_VERSION='0.7.1' -PACKAGE_STRING='gjs 0.7.1' +PACKAGE_VERSION='0.7.2' +PACKAGE_STRING='gjs 0.7.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gjs' PACKAGE_URL='' @@ -620,6 +620,7 @@ READLINE_LIBS HAVE_READLINE_FALSE HAVE_READLINE_TRUE +GI_DATADIR GJSTESTS_LIBS GJSTESTS_CFLAGS GJS_DBUS_LIBS @@ -1343,7 +1344,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gjs 0.7.1 to adapt to many kinds of systems. +\`configure' configures gjs 0.7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1413,7 +1414,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gjs 0.7.1:";; + short | recursive ) echo "Configuration of gjs 0.7.2:";; esac cat <<\_ACEOF @@ -1545,7 +1546,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gjs configure 0.7.1 +gjs configure 0.7.2 generated by GNU Autoconf 2.66 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2035,7 +2036,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gjs $as_me 0.7.1, which was +It was created by gjs $as_me 0.7.2, which was generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -2850,7 +2851,7 @@ # Define the identity of the package. PACKAGE='gjs' - VERSION='0.7.1' + VERSION='0.7.2' cat >>confdefs.h <<_ACEOF @@ -15083,6 +15084,48 @@ as_fn_error $? "SpiderMonkey is too old, Firefox 3 is required" "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_DefinePropertyById in -lmozjs" >&5 +$as_echo_n "checking for JS_DefinePropertyById in -lmozjs... " >&6; } +if test "${ac_cv_lib_mozjs_JS_DefinePropertyById+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmozjs $JS_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char JS_DefinePropertyById (); +int +main () +{ +return JS_DefinePropertyById (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_mozjs_JS_DefinePropertyById=yes +else + ac_cv_lib_mozjs_JS_DefinePropertyById=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mozjs_JS_DefinePropertyById" >&5 +$as_echo "$ac_cv_lib_mozjs_JS_DefinePropertyById" >&6; } +if test "x$ac_cv_lib_mozjs_JS_DefinePropertyById" = x""yes; then : + : +else + as_fn_error $? "SpiderMonkey is too old, xulrunner 1.9.1 is required" "$LINENO" 5 +fi + ## workaround for Ubuntu Hardy bug where mozilla-js.pc gives CFLAGS ## -I.../stable while jsapi.h is in .../unstable @@ -15148,7 +15191,7 @@ common_packages="gobject-2.0 >= 2.16.0 $JS_PACKAGE" gjs_packages="gmodule-2.0 gthread-2.0 $common_packages" -gjs_gi_packages="gobject-introspection-1.0 >= 0.6.10 $common_packages" +gjs_gi_packages="gobject-introspection-1.0 >= 0.9.5 $common_packages" gjs_cairo_packages="cairo $common_packages" gjs_dbus_packages="dbus-glib-1 $common_packages" # gjs-tests links against everything @@ -15627,6 +15670,9 @@ fi +GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) + + if test x"$JS_PACKAGE" = x; then # if JS_PACKAGE is undefined, pkg-config modules don't include # SpiderMonkey and we need to deal with it ourselves @@ -16476,7 +16522,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gjs $as_me 0.7.1, which was +This file was extended by gjs $as_me 0.7.2, which was generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16542,7 +16588,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gjs config.status 0.7.1 +gjs config.status 0.7.2 configured by $0, generated by GNU Autoconf 2.66, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/configure.ac new/gjs-0.7.2/configure.ac --- old/gjs-0.7.1/configure.ac 2010-07-12 19:52:14.000000000 +0200 +++ new/gjs-0.7.2/configure.ac 2010-09-15 23:24:41.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([gjs], [0.7.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=gjs]) +AC_INIT([gjs], [0.7.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=gjs]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([gjs/console.c]) AC_CONFIG_HEADER([config.h]) @@ -141,6 +141,9 @@ AC_CHECK_LIB([mozjs], [JS_CallTracer], :, [AC_MSG_ERROR([SpiderMonkey is too old, Firefox 3 is required])], [$JS_LIBS]) +AC_CHECK_LIB([mozjs], [JS_DefinePropertyById], :, + [AC_MSG_ERROR([SpiderMonkey is too old, xulrunner 1.9.1 is required])], + [$JS_LIBS]) ## workaround for Ubuntu Hardy bug where mozilla-js.pc gives CFLAGS ## -I.../stable while jsapi.h is in .../unstable @@ -173,7 +176,7 @@ common_packages="gobject-2.0 >= gobject_required_version $JS_PACKAGE" gjs_packages="gmodule-2.0 gthread-2.0 $common_packages" -gjs_gi_packages="gobject-introspection-1.0 >= 0.6.10 $common_packages" +gjs_gi_packages="gobject-introspection-1.0 >= 0.9.5 $common_packages" gjs_cairo_packages="cairo $common_packages" gjs_dbus_packages="dbus-glib-1 $common_packages" # gjs-tests links against everything @@ -192,6 +195,9 @@ LIBS=$saved_LIBS PKG_CHECK_MODULES([GJSTESTS], [$gjstests_packages]) +GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0) +AC_SUBST(GI_DATADIR) + if test x"$JS_PACKAGE" = x; then # if JS_PACKAGE is undefined, pkg-config modules don't include # SpiderMonkey and we need to deal with it ourselves diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/gi/arg.c new/gjs-0.7.2/gi/arg.c --- old/gjs-0.7.1/gi/arg.c 2010-07-12 19:46:45.000000000 +0200 +++ new/gjs-0.7.2/gi/arg.c 2010-09-15 23:13:23.000000000 +0200 @@ -111,10 +111,10 @@ if (type == GI_TYPE_TAG_GTYPE) { /* Constant folding should handle this hopefully */ switch (sizeof(GType)) { - case 1: GI_TYPE_TAG_UINT8; - case 2: GI_TYPE_TAG_UINT16; - case 4: GI_TYPE_TAG_UINT32; - case 8: GI_TYPE_TAG_UINT64; + case 1: return GI_TYPE_TAG_UINT8; + case 2: return GI_TYPE_TAG_UINT16; + case 4: return GI_TYPE_TAG_UINT32; + case 8: return GI_TYPE_TAG_UINT64; default: g_assert_not_reached (); } } @@ -1792,6 +1792,7 @@ arg->v_pointer); } else { gjs_throw(context, "FIXME: Only supporting null-terminated arrays of strings"); + result = FALSE; } g_base_info_unref((GIBaseInfo*) param_info); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/gi/function.c new/gjs-0.7.2/gi/function.c --- old/gjs-0.7.1/gi/function.c 2010-05-19 22:52:40.000000000 +0200 +++ new/gjs-0.7.2/gi/function.c 2010-09-09 16:30:28.000000000 +0200 @@ -924,11 +924,7 @@ g_base_info_unref(interface_info); } destroy = g_arg_info_get_destroy(&arg_info); - if (is_method) - --destroy; closure = g_arg_info_get_closure(&arg_info); - if (is_method) - --closure; direction = g_arg_info_get_direction(&arg_info); if (destroy > 0 && destroy < n_args) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/gjs/byteArray.c new/gjs-0.7.2/gjs/byteArray.c --- old/gjs-0.7.1/gjs/byteArray.c 2010-06-24 23:54:19.000000000 +0200 +++ new/gjs-0.7.2/gjs/byteArray.c 2010-08-31 23:24:23.000000000 +0200 @@ -107,6 +107,8 @@ jsval value, gsize *v_p) { + guint32 val32; + /* Just JS_ValueToECMAUint32() would work. However, * we special case ints for two reasons: * - JS_ValueToECMAUint32() always goes via a double which is slow @@ -122,11 +124,15 @@ *v_p = i; return JS_TRUE; } else { + JSBool ret; /* This is pretty liberal (it converts about anything to * a number) but it's what we use elsewhere in gjs too. */ - return JS_ValueToECMAUint32(context, value, - v_p); + + ret = JS_ValueToECMAUint32(context, value, + &val32); + *v_p = val32; + return ret; } } @@ -194,7 +200,7 @@ /* First handle array indexing */ if (JSVAL_IS_NUMBER(id)) { - unsigned int idx; + gsize idx; if (!gjs_value_to_gsize(context, id, &idx)) return JS_FALSE; return byte_array_get_index(context, obj, priv, idx, value_p); @@ -233,7 +239,7 @@ jsval *value_p) { ByteArrayInstance *priv; - guint32 len = 0; + gsize len = 0; priv = priv_from_js(context, obj); @@ -352,7 +358,7 @@ return JS_TRUE; /* prototype, not an instance. */ if (JSVAL_IS_NUMBER(id)) { - unsigned int idx; + gsize idx; if (!gjs_value_to_gsize(context, id, &idx)) return JS_FALSE; if (idx >= priv->array->len) { @@ -425,7 +431,7 @@ gboolean is_proto; JSClass *obj_class; JSClass *proto_class; - guint32 preallocated_length; + gsize preallocated_length; if (!gjs_check_constructing(context)) return JS_FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/gjs-dbus/dbus-proxy.c new/gjs-0.7.2/gjs-dbus/dbus-proxy.c --- old/gjs-0.7.1/gjs-dbus/dbus-proxy.c 2010-05-03 16:14:17.000000000 +0200 +++ new/gjs-0.7.2/gjs-dbus/dbus-proxy.c 2010-08-20 15:35:46.000000000 +0200 @@ -557,13 +557,13 @@ reply_closure_free(c); } -static void -gjs_dbus_proxy_send_internal(GjsDBusProxy *proxy, - DBusMessage *message, - GjsDBusProxyReplyFunc plain_func, - GjsDBusProxyJsonReplyFunc json_func, - GjsDBusProxyErrorReplyFunc error_func, - void *data) +void +gjs_dbus_proxy_send_full(GjsDBusProxy *proxy, + DBusMessage *message, + GjsDBusProxyReplyFunc plain_func, + GjsDBusProxyJsonReplyFunc json_func, + GjsDBusProxyErrorReplyFunc error_func, + void *data) { ReplyClosure *c; DBusPendingCall *pending; @@ -606,7 +606,7 @@ GjsDBusProxyErrorReplyFunc error_func, void *data) { - gjs_dbus_proxy_send_internal(proxy, message, reply_func, NULL, error_func, data); + gjs_dbus_proxy_send_full(proxy, message, reply_func, NULL, error_func, data); } static void @@ -658,7 +658,7 @@ dbus_message_iter_close_container(&arg_iter, &dict_iter); - gjs_dbus_proxy_send_internal(proxy, message, NULL, reply_func, error_func, data); + gjs_dbus_proxy_send_full(proxy, message, NULL, reply_func, error_func, data); dbus_message_unref(message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/gjs-dbus/dbus-proxy.h new/gjs-0.7.2/gjs-dbus/dbus-proxy.h --- old/gjs-0.7.1/gjs-dbus/dbus-proxy.h 2009-09-17 11:14:09.000000000 +0200 +++ new/gjs-0.7.2/gjs-dbus/dbus-proxy.h 2010-08-20 15:35:46.000000000 +0200 @@ -52,6 +52,12 @@ GjsDBusProxyReplyFunc reply_func, GjsDBusProxyErrorReplyFunc error_func, void *data); +void gjs_dbus_proxy_send_full (GjsDBusProxy *proxy, + DBusMessage *message, + GjsDBusProxyReplyFunc plain_func, + GjsDBusProxyJsonReplyFunc json_func, + GjsDBusProxyErrorReplyFunc error_func, + void *data); /* varargs are like: * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/test/js/testEverythingBasic.js new/gjs-0.7.2/test/js/testEverythingBasic.js --- old/gjs-0.7.1/test/js/testEverythingBasic.js 2010-07-12 19:46:45.000000000 +0200 +++ new/gjs-0.7.2/test/js/testEverythingBasic.js 2010-08-31 23:24:23.000000000 +0200 @@ -1,4 +1,5 @@ -const Everything = imports.gi.Everything; +// This used to be called "Everything" +const Everything = imports.gi.Regress; if (!('assertEquals' in this)) { /* allow running this test standalone */ imports.lang.copyPublicProperties(imports.jsUnit, this); gjstestRun = function() { return imports.jsUnit.gjstestRun(window); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/test/js/testEverythingEncapsulated.js new/gjs-0.7.2/test/js/testEverythingEncapsulated.js --- old/gjs-0.7.1/test/js/testEverythingEncapsulated.js 2010-05-03 16:14:17.000000000 +0200 +++ new/gjs-0.7.2/test/js/testEverythingEncapsulated.js 2010-08-31 23:24:23.000000000 +0200 @@ -1,4 +1,5 @@ -const Everything = imports.gi.Everything; +// This used to be called "Everything" +const Everything = imports.gi.Regress; if (!('assertEquals' in this)) { /* allow running this test standalone */ imports.lang.copyPublicProperties(imports.jsUnit, this); gjstestRun = function() { return imports.jsUnit.gjstestRun(window); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gjs-0.7.1/test/js/testGI.js new/gjs-0.7.2/test/js/testGI.js --- old/gjs-0.7.1/test/js/testGI.js 2010-02-12 04:07:40.000000000 +0100 +++ new/gjs-0.7.2/test/js/testGI.js 2010-08-31 23:24:23.000000000 +0200 @@ -1,7 +1,8 @@ function testUTF8() { const GLib = imports.gi.GLib; - assertEquals(0x2664, GLib.utf8_get_char("\u2664 utf8")); + // gunichar is temporarily not-introspectable + //assertEquals(0x2664, GLib.utf8_get_char("\u2664 utf8")); } function testThrows() { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org