commit at-spi2-core for openSUSE:Factory

31 Mar 2010

Hello community,

here is the log from the commit of package at-spi2-core for openSUSE:Factory
checked in at Wed Mar 31 19:40:09 CEST 2010.



--------

--- GNOME/at-spi2-core/at-spi2-core.changes	2010-03-02 00:38:45.000000000 +0100
+++ /mounts/work_src_done/STABLE/at-spi2-core/at-spi2-core.changes	2010-03-31 01:26:01.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Mar 31 01:23:13 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 0.1.8:
+  + Quit if at-spi-dbus is disabled
+  + Call g_type_init()
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  at-spi2-core-0.1.7.tar.bz2

New:
----
  at-spi2-core-0.1.8.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ at-spi2-core.spec ++++++
--- /var/tmp/diff_new_pack.uVwQoc/_old	2010-03-31 19:39:51.000000000 +0200
+++ /var/tmp/diff_new_pack.uVwQoc/_new	2010-03-31 19:39:51.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package at-spi2-core (Version 0.1.7)
+# spec file for package at-spi2-core (Version 0.1.8)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 
 
 Name:           at-spi2-core
-Version:        0.1.7
+Version:        0.1.8
 Release:        1
 # FIXME: check that tarballs > 0.1.6 ship bus/ directory, and if they do, reapply patch0 and call to suse_update_desktop_file
 Summary:        Assistive Technology Service Provider Interface - D-Bus based implementation

++++++ at-spi2-core-0.1.7.tar.bz2 -> at-spi2-core-0.1.8.tar.bz2 ++++++
++++ 11010 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-core-0.1.7/config.h.in new/at-spi2-core-0.1.8/config.h.in
--- old/at-spi2-core-0.1.7/config.h.in	2010-02-12 05:04:33.000000000 +0100
+++ new/at-spi2-core-0.1.8/config.h.in	2010-03-30 23:42:17.000000000 +0200
@@ -58,12 +58,12 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Relocate to coexist with CORBA */
+#undef RELOCATE
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-core-0.1.7/configure.ac new/at-spi2-core-0.1.8/configure.ac
--- old/at-spi2-core-0.1.7/configure.ac	2010-02-12 05:02:10.000000000 +0100
+++ new/at-spi2-core-0.1.8/configure.ac	2010-03-30 23:41:35.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-core], [0.1.7], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-core], [0.1.8], [accessibility-atspi@lists.linux-foundation.org])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -128,6 +128,12 @@
 
 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
 
+AC_ARG_ENABLE(relocate, [  --enable-relocate  Relocate to coexist with CORBA [default=yes]], enable_relocate="$enableval", enable_relocate=yes)
+if test x$enable_relocate = xyes ; then
+	AC_DEFINE(RELOCATE, , [Relocate to coexist with CORBA])
+fi
+AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
+
 AC_CONFIG_FILES([Makefile
 		 xml/Makefile
 		 registryd/Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-core-0.1.7/m4/libtool.m4 new/at-spi2-core-0.1.8/m4/libtool.m4
--- old/at-spi2-core-0.1.7/m4/libtool.m4	2010-02-12 05:04:29.000000000 +0100
+++ new/at-spi2-core-0.1.8/m4/libtool.m4	2010-03-30 23:42:10.000000000 +0200
@@ -2485,18 +2485,6 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
@@ -3088,7 +3076,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd* | netbsdelf*-gnu)
+netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -3769,7 +3757,7 @@
 	    ;;
 	esac
 	;;
-      netbsd* | netbsdelf*-gnu)
+      netbsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4194,9 +4182,6 @@
   cygwin* | mingw* | cegcc*)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
@@ -4261,9 +4246,6 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4446,7 +4428,7 @@
       fi
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -4621,7 +4603,6 @@
 	if test "$aix_use_runtimelinking" = yes; then
 	  shared_flag="$shared_flag "'${wl}-G'
 	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -4860,7 +4841,7 @@
       _LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd* | netbsdelf*-gnu)
+    netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-core-0.1.7/registryd/registry-main.c new/at-spi2-core-0.1.8/registryd/registry-main.c
--- old/at-spi2-core-0.1.7/registryd/registry-main.c	2010-02-12 03:16:01.000000000 +0100
+++ new/at-spi2-core-0.1.8/registryd/registry-main.c	2010-03-30 23:41:35.000000000 +0200
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <glib.h>
 #include <stdio.h>
+#include <dlfcn.h>
 
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
@@ -38,6 +39,14 @@
     #error "No introspection XML directory defined"
 #endif
 
+#ifdef RELOCATE
+#define DBUS_GCONF_KEY  "/desktop/gnome/interface/at-spi-dbus"
+#else
+#define CORBA_GCONF_KEY  "/desktop/gnome/interface/at-spi-corba"
+#endif
+
+static gboolean need_to_quit ();
+
 static GMainLoop *mainloop;
 static gchar *dbus_name = NULL;
 static gboolean use_gnome_session = FALSE;
@@ -275,6 +284,9 @@
 
 /*---------------------------------------------------------------------------*/
 
+typedef GObject *(*gconf_client_get_default_t) ();
+typedef gboolean (*gconf_client_get_bool_t)(GObject *, const char *, void *);
+
 int
 main (int argc, char **argv)
 {
@@ -290,6 +302,9 @@
   DBusError error;
   int ret;
 
+  if (need_to_quit ())
+    return 0;
+
   g_type_init();
 
   /*Parse command options*/
@@ -343,3 +358,43 @@
   g_main_loop_run (mainloop);
   return 0;
 }
+
+static gboolean
+need_to_quit ()
+{
+  void *gconf = NULL;
+  gconf_client_get_default_t gconf_client_get_default = NULL;
+  gconf_client_get_bool_t gconf_client_get_bool = NULL;
+  GObject *gconf_client;	/* really a GConfClient */
+  gboolean ret;
+
+  g_type_init ();
+
+  gconf = dlopen ("libgconf-2.so", RTLD_LAZY);
+  if (gconf)
+    {
+      gconf_client_get_default = dlsym (gconf, "gconf_client_get_default");
+      gconf_client_get_bool = dlsym (gconf, "gconf_client_get_bool");
+  }
+
+  if (!gconf_client || !gconf_client_get_bool)
+    {
+      if (gconf)
+        dlclose (gconf);
+      return FALSE;
+    }
+
+  /* If we've been relocated, we will exit if the at-spi-corba gconf key
+ * has been set.  If we have not been relocated, we will only run if the
+ * at-spi-dbus gconf key has been set.
+   */
+  gconf_client = gconf_client_get_default ();
+#ifdef RELOCATE
+  ret = !gconf_client_get_bool (gconf_client, DBUS_GCONF_KEY, NULL);
+#else
+  ret = gconf_client_get_bool (gconf_client, CORBA_GCONF_KEY, NULL);
+#endif
+  g_object_unref (gconf_client);
+
+  return ret;
+}


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)