Hello community, here is the log from the commit of package at-spi2-core for openSUSE:Factory checked in at 2013-09-23 14:13:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/at-spi2-core (Old) and /work/SRC/openSUSE:Factory/.at-spi2-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "at-spi2-core" Changes: -------- --- /work/SRC/openSUSE:Factory/at-spi2-core/at-spi2-core.changes 2013-09-11 11:05:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.at-spi2-core.new/at-spi2-core.changes 2013-09-23 14:20:20.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 16 22:10:09 UTC 2013 - [email protected] + +- Update to version 2.9.92: + + Fix multiple deadlocks with keystroke listeners (bgo#707218). + +------------------------------------------------------------------- Old: ---- at-spi2-core-2.9.91.tar.xz New: ---- at-spi2-core-2.9.92.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at-spi2-core.spec ++++++ --- /var/tmp/diff_new_pack.e9BWGZ/_old 2013-09-23 14:20:21.000000000 +0200 +++ /var/tmp/diff_new_pack.e9BWGZ/_new 2013-09-23 14:20:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: at-spi2-core -Version: 2.9.91 +Version: 2.9.92 Release: 0 Summary: Assistive Technology Service Provider Interface - D-Bus based implementation License: GPL-2.0+ ++++++ at-spi2-core-2.9.91.tar.xz -> at-spi2-core-2.9.92.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-2.9.91/NEWS new/at-spi2-core-2.9.92/NEWS --- old/at-spi2-core-2.9.91/NEWS 2013-09-02 21:01:37.000000000 +0200 +++ new/at-spi2-core-2.9.92/NEWS 2013-09-16 23:30:24.000000000 +0200 @@ -1,3 +1,8 @@ +What's new in at-spi2-core 2.9.92: + +* Fix multiple deadlocks with keystroke listeners (BGO#707218). + + What's new in at-spi2-core 2.9.91: * Fix a performance issue when running for a long time without a main diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-2.9.91/atspi/atspi-matchrule.c new/at-spi2-core-2.9.92/atspi/atspi-matchrule.c --- old/at-spi2-core-2.9.91/atspi/atspi-matchrule.c 2013-05-11 01:09:44.000000000 +0200 +++ new/at-spi2-core-2.9.92/atspi/atspi-matchrule.c 2013-09-15 19:04:20.000000000 +0200 @@ -81,7 +81,10 @@ * @statematchtype: An #AtspiCollectionMatchType specifying how to interpret * @states. * @attributes: (element-type gchar* gchar*): A #GHashTable specifying - * attributes to match. + * attributes to match. To specify multiple attribute values, + * separate each value with a :: If an attribute value contains a :, + * then it can be escaped by preceding it with a \. A backslash can + * likewise be escaped by inserting a double backslash. * @attributematchtype: An #AtspiCollectionMatchType specifying how to * interpret @attributes. * @interfaces: (element-type gchar*): An array of interfaces to match, or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-2.9.91/atspi/atspi-misc-private.h new/at-spi2-core-2.9.92/atspi/atspi-misc-private.h --- old/at-spi2-core-2.9.91/atspi/atspi-misc-private.h 2013-05-22 22:21:57.000000000 +0200 +++ new/at-spi2-core-2.9.92/atspi/atspi-misc-private.h 2013-09-05 16:05:58.000000000 +0200 @@ -106,8 +106,6 @@ GArray *_atspi_dbus_attribute_array_from_iter (DBusMessageIter *iter); -gboolean _atspi_process_deferred_messages (gpointer data); - void _atspi_dbus_set_interfaces (AtspiAccessible *accessible, DBusMessageIter *iter); void _atspi_dbus_set_state (AtspiAccessible *accessible, DBusMessageIter *iter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-2.9.91/atspi/atspi-misc.c new/at-spi2-core-2.9.92/atspi/atspi-misc.c --- old/at-spi2-core-2.9.91/atspi/atspi-misc.c 2013-09-02 19:03:11.000000000 +0200 +++ new/at-spi2-core-2.9.92/atspi/atspi-misc.c 2013-09-15 16:44:23.000000000 +0200 @@ -37,7 +37,6 @@ #include <string.h> static void handle_get_items (DBusPendingCall *pending, void *user_data); -gboolean _atspi_process_deferred_messages (gpointer data); static DBusConnection *bus = NULL; static GHashTable *live_refs = NULL; @@ -733,7 +732,7 @@ void *data; } BusDataClosure; -static guint process_deferred_messages_id = -1; +static GSource *process_deferred_messages_source = NULL; static void process_deferred_message (BusDataClosure *closure) @@ -767,8 +766,8 @@ static GQueue *deferred_messages = NULL; -gboolean -_atspi_process_deferred_messages (gpointer data) +static gboolean +process_deferred_messages (void) { static int in_process_deferred_messages = 0; BusDataClosure *closure; @@ -783,13 +782,20 @@ dbus_connection_unref (closure->bus); g_free (closure); } - /* If data is NULL, assume that we were called from GLib */ - if (!data) - process_deferred_messages_id = -1; in_process_deferred_messages = 0; return FALSE; } +static gboolean +process_deferred_messages_callback (gpointer data) +{ + if (process_deferred_messages ()) + return G_SOURCE_CONTINUE; + + process_deferred_messages_source = NULL; + return G_SOURCE_REMOVE; +} + static DBusHandlerResult defer_message (DBusConnection *connection, DBusMessage *message, void *user_data) { @@ -801,12 +807,12 @@ g_queue_push_tail (deferred_messages, closure); - if (process_deferred_messages_id == -1) + if (process_deferred_messages_source == NULL) { - GSource *source = g_idle_source_new (); - g_source_set_callback (source, _atspi_process_deferred_messages, NULL, NULL); - process_deferred_messages_id = g_source_attach (source, atspi_main_context); - g_source_unref (source); + process_deferred_messages_source = g_idle_source_new (); + g_source_set_callback (process_deferred_messages_source, + process_deferred_messages_callback, NULL, NULL); + g_source_attach (process_deferred_messages_source, atspi_main_context); } return DBUS_HANDLER_RESULT_HANDLED; @@ -1131,7 +1137,7 @@ type, args); va_end (args); check_for_hang (NULL, &err, aobj->app->bus, aobj->app->bus_name); - _atspi_process_deferred_messages ((gpointer)TRUE); + process_deferred_messages (); if (dbus_error_is_set (&err)) { g_set_error(error, ATSPI_ERROR, ATSPI_ERROR_IPC, "%s", err.message); @@ -1188,7 +1194,7 @@ va_end (args); if (msg) dbus_message_unref (msg); - _atspi_process_deferred_messages ((gpointer)TRUE); + process_deferred_messages (); if (dbus_error_is_set (&err)) { /* TODO: Set gerror */ @@ -1239,7 +1245,7 @@ reply = dbind_send_and_allow_reentry (aobj->app->bus, message, &err); check_for_hang (reply, &err, aobj->app->bus, aobj->app->bus_name); dbus_message_unref (message); - _atspi_process_deferred_messages ((gpointer)TRUE); + process_deferred_messages (); if (!reply) { // TODO: throw exception @@ -1302,7 +1308,7 @@ dbus_error_init (&err); set_timeout (app); reply = dbind_send_and_allow_reentry (bus, message, &err); - _atspi_process_deferred_messages ((gpointer)TRUE); + process_deferred_messages (); dbus_message_unref (message); if (dbus_error_is_set (&err)) { @@ -1650,6 +1656,16 @@ void atspi_set_main_context (GMainContext *cnx) { + if (atspi_main_context == cnx) + return; + if (process_deferred_messages_source != NULL) + { + g_source_destroy (process_deferred_messages_source); + process_deferred_messages_source = g_idle_source_new (); + g_source_set_callback (process_deferred_messages_source, + process_deferred_messages_callback, NULL, NULL); + g_source_attach (process_deferred_messages_source, cnx); + } atspi_main_context = cnx; atspi_dbus_connection_setup_with_g_main (atspi_get_a11y_bus (), cnx); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-2.9.91/configure new/at-spi2-core-2.9.92/configure --- old/at-spi2-core-2.9.91/configure 2013-09-02 21:02:28.000000000 +0200 +++ new/at-spi2-core-2.9.92/configure 2013-09-16 23:30:43.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for at-spi2-core 2.9.91. +# Generated by GNU Autoconf 2.69 for at-spi2-core 2.9.92. # # Report bugs to <[email protected]>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='at-spi2-core' PACKAGE_TARNAME='at-spi2-core' -PACKAGE_VERSION='2.9.91' -PACKAGE_STRING='at-spi2-core 2.9.91' +PACKAGE_VERSION='2.9.92' +PACKAGE_STRING='at-spi2-core 2.9.92' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1438,7 +1438,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 at-spi2-core 2.9.91 to adapt to many kinds of systems. +\`configure' configures at-spi2-core 2.9.92 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1512,7 +1512,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of at-spi2-core 2.9.91:";; + short | recursive ) echo "Configuration of at-spi2-core 2.9.92:";; esac cat <<\_ACEOF @@ -1649,7 +1649,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -at-spi2-core configure 2.9.91 +at-spi2-core configure 2.9.92 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2018,7 +2018,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by at-spi2-core $as_me 2.9.91, which was +It was created by at-spi2-core $as_me 2.9.92, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2862,7 +2862,7 @@ # Define the identity of the package. PACKAGE='at-spi2-core' - VERSION='2.9.91' + VERSION='2.9.92' cat >>confdefs.h <<_ACEOF @@ -14534,11 +14534,31 @@ # Put the nasty error message in config.log where it belongs echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - : + as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: + +$GTKDOC_DEPS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - : + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS +and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } else GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS @@ -14573,10 +14593,6 @@ enable_gtk_doc_pdf=no fi - if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 - fi - if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= @@ -15197,7 +15213,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by at-spi2-core $as_me 2.9.91, which was +This file was extended by at-spi2-core $as_me 2.9.92, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15263,7 +15279,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -at-spi2-core config.status 2.9.91 +at-spi2-core config.status 2.9.92 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-2.9.91/configure.ac new/at-spi2-core-2.9.92/configure.ac --- old/at-spi2-core-2.9.91/configure.ac 2013-09-02 19:52:44.000000000 +0200 +++ new/at-spi2-core-2.9.92/configure.ac 2013-09-16 23:30:29.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-core], [2.9.91], [[email protected]]) +AC_INIT([at-spi2-core], [2.9.92], [[email protected]]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-2.9.91/dbind/dbind.c new/at-spi2-core-2.9.92/dbind/dbind.c --- old/at-spi2-core-2.9.91/dbind/dbind.c 2013-09-02 19:03:11.000000000 +0200 +++ new/at-spi2-core-2.9.92/dbind/dbind.c 2013-09-06 01:58:42.000000000 +0200 @@ -86,7 +86,6 @@ closure = g_new0 (SpiReentrantCallClosure, 1); closure->reply = NULL; - atspi_dbus_connection_setup_with_g_main(bus, NULL); if (!dbus_connection_send_with_reply (bus, message, &pending, dbind_timeout) || !pending) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-2.9.91/doc/libatspi/Makefile.in new/at-spi2-core-2.9.92/doc/libatspi/Makefile.in --- old/at-spi2-core-2.9.91/doc/libatspi/Makefile.in 2013-09-02 21:02:30.000000000 +0200 +++ new/at-spi2-core-2.9.92/doc/libatspi/Makefile.in 2013-09-16 23:30:45.000000000 +0200 @@ -392,42 +392,6 @@ @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp - -#### setup #### -GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) -GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; - -#### scan #### -GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) -GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; -GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) -GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; - -#### templates #### -GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) -GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; - -#### xml #### -GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) -GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_XML_0 = @echo " DOC Building XML"; - -#### html #### -GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) -GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; -GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) -GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; - -#### pdf #### -GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) -GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -636,28 +600,35 @@ $(REPORT_FILES): sgml-build.stamp +#### setup #### + setup-build.stamp: - -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + echo ' DOC Preparing build'; \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - $(AM_V_at)touch setup-build.stamp + @touch setup-build.stamp + +#### scan #### scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - $(GTK_DOC_V_SCAN)_source_dir='' ; \ + @echo ' DOC Scanning header files' + @_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + echo " DOC Introspecting gobjects"; \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -672,19 +643,22 @@ test -f $$i || touch $$i ; \ done \ fi - $(AM_V_at)touch scan-build.stamp + @touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true +#### templates #### + tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + @echo ' DOC Rebuilding template files' + @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - $(AM_V_at)touch tmpl-build.stamp + @touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -692,20 +666,28 @@ $(srcdir)/tmpl/*.sgml: @true +#### xml #### + sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ + @echo ' DOC Building XML' + @-chmod -R u+w $(srcdir) + @_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - $(AM_V_at)touch sgml-build.stamp + @touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true +#### html #### + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ - mkhtml_options=""; \ + @echo ' DOC Building HTML' + @rm -rf html + @mkdir html + @mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -726,12 +708,16 @@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - $(AM_V_at)touch html-build.stamp + @echo ' DOC Fixing cross-references' + @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + @touch html-build.stamp + +#### pdf #### pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ - mkpdf_options=""; \ + @echo ' DOC Building PDF' + @rm -f $(DOC_MODULE).pdf + @mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -748,7 +734,7 @@ done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - $(AM_V_at)touch pdf-build.stamp + @touch pdf-build.stamp ############## @@ -764,7 +750,7 @@ rm -rf tmpl; \ fi -maintainer-clean-local: +maintainer-clean-local: clean @rm -rf xml html install-data-local: @@ -800,7 +786,7 @@ # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-2.9.91/gtk-doc.make new/at-spi2-core-2.9.92/gtk-doc.make --- old/at-spi2-core-2.9.91/gtk-doc.make 2013-06-27 22:08:46.000000000 +0200 +++ new/at-spi2-core-2.9.92/gtk-doc.make 2013-01-27 02:19:38.000000000 +0100 @@ -74,42 +74,33 @@ #### setup #### -GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) -GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; - setup-build.stamp: - -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + echo ' DOC Preparing build'; \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - $(AM_V_at)touch setup-build.stamp + @touch setup-build.stamp #### scan #### -GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) -GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; - -GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) -GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; - scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - $(GTK_DOC_V_SCAN)_source_dir='' ; \ + @echo ' DOC Scanning header files' + @_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ + echo " DOC Introspecting gobjects"; \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -124,25 +115,22 @@ test -f $$i || touch $$i ; \ done \ fi - $(AM_V_at)touch scan-build.stamp + @touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true #### templates #### -GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V)) -GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files"; - tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + @echo ' DOC Rebuilding template files' + @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - $(AM_V_at)touch tmpl-build.stamp + @touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -152,34 +140,26 @@ #### xml #### -GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) -GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_XML_0=@echo " DOC Building XML"; - sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ + @echo ' DOC Building XML' + @-chmod -R u+w $(srcdir) + @_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - $(AM_V_at)touch sgml-build.stamp + @touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true #### html #### -GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) -GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; - -GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) -GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ - mkhtml_options=""; \ + @echo ' DOC Building HTML' + @rm -rf html + @mkdir html + @mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -200,18 +180,16 @@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - $(AM_V_at)touch html-build.stamp + @echo ' DOC Fixing cross-references' + @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + @touch html-build.stamp #### pdf #### -GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) -GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; - pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ - mkpdf_options=""; \ + @echo ' DOC Building PDF' + @rm -f $(DOC_MODULE).pdf + @mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -228,7 +206,7 @@ done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - $(AM_V_at)touch pdf-build.stamp + @touch pdf-build.stamp ############## @@ -244,7 +222,7 @@ rm -rf tmpl; \ fi -maintainer-clean-local: +maintainer-clean-local: clean @rm -rf xml html install-data-local: @@ -281,7 +259,7 @@ # Require gtk-doc when making dist # if ENABLE_GTK_DOC -dist-check-gtkdoc: docs +dist-check-gtkdoc: else dist-check-gtkdoc: @echo "*** gtk-doc must be installed and enabled in order to make dist" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-2.9.91/m4/gtk-doc.m4 new/at-spi2-core-2.9.92/m4/gtk-doc.m4 --- old/at-spi2-core-2.9.91/m4/gtk-doc.m4 2013-06-27 22:08:46.000000000 +0200 +++ new/at-spi2-core-2.9.92/m4/gtk-doc.m4 2013-01-27 02:19:38.000000000 +0100 @@ -37,7 +37,7 @@ dnl don't check for glib if we build glib if test "x$PACKAGE_NAME" != "xglib"; then dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) fi fi @@ -58,10 +58,6 @@ enable_gtk_doc_pdf=no fi - if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 - fi - AC_SUBST([AM_DEFAULT_VERBOSITY]) AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
