Hello community,
here is the log from the commit of package at-spi2-core for openSUSE:Factory
checked in at Tue Dec 29 19:02:37 CET 2009.
--------
--- GNOME/at-spi2-core/at-spi2-core.changes 2009-12-02 19:15:13.000000000 +0100
+++ /mounts/work_src_done/STABLE/at-spi2-core/at-spi2-core.changes 2009-12-22 17:37:37.000000000 +0100
@@ -1,0 +2,22 @@
+Tue Dec 22 17:12:38 CET 2009 - vuntz@opensuse.org
+
+- Update to version 0.1.4:
+ + For the full list of changes, see
+ http://git.gnome.org/cgit/at-spi2-core/log/?id=AT_SPI2_CORE_0_1_4
+ + Use the new 'Accessibility' bus if the bus address is available
+ on the X property AT_SPI_BUS.
+ + Add command line option to enable interaction with the gnome
+ session manager.
+ + Add the configure file for the (non-secure) accessibility bus.
+ + Use datarootdir for placing XML files so that the are in a
+ shared directory not under the name of this module but
+ 'at-spi2'.
+ + Make sure the d-bus bus configuration is included in the
+ distribution.
+ + Add a configure variable for the location of the dbus-daemon in
+ the at-spi-dbus-bus script.
+- Pass --with-dbus-daemondir to configure.
+- Add at-spi2-core-dbus-path.patch to use the right path for a dbus
+ helper.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
at-spi2-core-0.1.3.tar.bz2
New:
----
at-spi2-core-0.1.4.tar.bz2
at-spi2-core-dbus-path.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ at-spi2-core.spec ++++++
--- /var/tmp/diff_new_pack.MJPN9O/_old 2009-12-29 19:02:26.000000000 +0100
+++ /var/tmp/diff_new_pack.MJPN9O/_new 2009-12-29 19:02:26.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package at-spi2-core (Version 0.1.3)
+# spec file for package at-spi2-core (Version 0.1.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
Name: at-spi2-core
-Version: 0.1.3
+Version: 0.1.4
Release: 1
Summary: Assistive Technology Service Provider Interface - D-Bus based implementation
License: GPLv2+
@@ -26,6 +26,8 @@
Url: http://www.gnome.org/
Source0: %{name}-%{version}.tar.bz2
Source99: %{name}-rpmlintrc
+# PATCH-FIX-UPSTREAM at-spi2-core-dbus-path.patch vuntz@opensuse.org -- Use the right path for a dbus helper. This will be fixed upstream in a more generic way
+Patch0: at-spi2-core-dbus-path.patch
BuildRequires: dbus-1-glib-devel
BuildRequires: gtk2-devel
BuildRequires: update-desktop-files
@@ -46,15 +48,18 @@
%prep
%setup -q
+%patch0 -p1
%build
%configure \
--libexecdir=%{_libexecdir}/at-spi2 \
+ --with-dbus-daemondir=/bin \
--disable-static
%__make %{?jobs:-j%jobs}
%install
%makeinstall
+%suse_update_desktop_file at-spi-dbus-bus
%clean
rm -rf %{buildroot}
@@ -66,8 +71,11 @@
%files
%defattr(-,root,root)
%doc AUTHORS COPYING README
-%{_datadir}/%{name}/
+%{_bindir}/at-spi-dbus-bus
%{_libexecdir}/at-spi2/
+%{_sysconfdir}/at-spi2/
+%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
+%{_datadir}/at-spi2/
%{_datadir}/dbus-1/services/org.freedesktop.atspi.Registry.service
%changelog
++++++ at-spi2-core-0.1.3.tar.bz2 -> at-spi2-core-0.1.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/Makefile.am new/at-spi2-core-0.1.4/Makefile.am
--- old/at-spi2-core-0.1.3/Makefile.am 2009-11-17 19:29:18.000000000 +0100
+++ new/at-spi2-core-0.1.4/Makefile.am 2009-12-14 11:36:11.000000000 +0100
@@ -1,3 +1,3 @@
-SUBDIRS=xml tools registryd
+SUBDIRS=xml tools registryd bus
ACLOCAL_AMFLAGS=-I m4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/Makefile.in new/at-spi2-core-0.1.4/Makefile.in
--- old/at-spi2-core-0.1.3/Makefile.in 2009-11-30 17:17:43.000000000 +0100
+++ new/at-spi2-core-0.1.4/Makefile.in 2009-12-22 00:28:29.000000000 +0100
@@ -40,10 +40,10 @@
config/config.guess config/config.sub config/depcomp \
config/install-sh config/ltmain.sh config/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expend.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -120,6 +120,7 @@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_LIBS = @DBUS_LIBS@
@@ -134,6 +135,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+EXPANDED_BINDIR = @EXPANDED_BINDIR@
FGREP = @FGREP@
GDK_CFLAGS = @GDK_CFLAGS@
GDK_LIBS = @GDK_LIBS@
@@ -244,7 +246,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = xml tools registryd
+SUBDIRS = xml tools registryd bus
ACLOCAL_AMFLAGS = -I m4
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/aclocal.m4 new/at-spi2-core-0.1.4/aclocal.m4
--- old/at-spi2-core-0.1.3/aclocal.m4 2009-11-30 17:17:42.000000000 +0100
+++ new/at-spi2-core-0.1.4/aclocal.m4 2009-12-22 00:28:26.000000000 +0100
@@ -1107,6 +1107,7 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([m4/as-ac-expend.m4])
m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/bus/Makefile.am new/at-spi2-core-0.1.4/bus/Makefile.am
--- old/at-spi2-core-0.1.3/bus/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/at-spi2-core-0.1.4/bus/Makefile.am 2009-12-18 00:33:09.000000000 +0100
@@ -0,0 +1,14 @@
+busconfigdir=$(sysconfdir)/at-spi2
+busconfig_DATA=\
+ accessibility.conf
+
+atspidbusdir=$(bindir)
+atspidbus_SCRIPTS=\
+ at-spi-dbus-bus
+
+default_sessiondir = $(sysconfdir)/xdg/autostart
+default_session_DATA = at-spi-dbus-bus.desktop
+
+EXTRA_DIST= \
+ accessibility.conf \
+ at-spi-dbus-bus.desktop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/bus/Makefile.in new/at-spi2-core-0.1.4/bus/Makefile.in
--- old/at-spi2-core-0.1.3/bus/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ new/at-spi2-core-0.1.4/bus/Makefile.in 2009-12-22 00:28:29.000000000 +0100
@@ -0,0 +1,506 @@
+# Makefile.in generated by automake 1.11 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = bus
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/at-spi-dbus-bus.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expend.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = at-spi-dbus-bus
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(atspidbusdir)" \
+ "$(DESTDIR)$(busconfigdir)" "$(DESTDIR)$(default_sessiondir)"
+SCRIPTS = $(atspidbus_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
+DATA = $(busconfig_DATA) $(default_session_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AT_SPI_CORE_VERSION = @AT_SPI_CORE_VERSION@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
+DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
+DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
+DBUS_LIBS = @DBUS_LIBS@
+DBUS_SERVICES_DIR = @DBUS_SERVICES_DIR@
+DEFAULT_ATSPI_INTROSPECTION_PATH = @DEFAULT_ATSPI_INTROSPECTION_PATH@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXPANDED_BINDIR = @EXPANDED_BINDIR@
+FGREP = @FGREP@
+GDK_CFLAGS = @GDK_CFLAGS@
+GDK_LIBS = @GDK_LIBS@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GOBJ_CFLAGS = @GOBJ_CFLAGS@
+GOBJ_LIBS = @GOBJ_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBTOOL_EXPORT_OPTIONS = @LIBTOOL_EXPORT_OPTIONS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_AGE = @LT_AGE@
+LT_CURRENT = @LT_CURRENT@
+LT_RELEASE = @LT_RELEASE@
+LT_REVISION = @LT_REVISION@
+LT_VERSION_INFO = @LT_VERSION_INFO@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+XEVIE_LIBS = @XEVIE_LIBS@
+XINPUT_LIBS = @XINPUT_LIBS@
+XMKMF = @XMKMF@
+XTST_LIBS = @XTST_LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+busconfigdir = $(sysconfdir)/at-spi2
+busconfig_DATA = \
+ accessibility.conf
+
+atspidbusdir = $(bindir)
+atspidbus_SCRIPTS = \
+ at-spi-dbus-bus
+
+default_sessiondir = $(sysconfdir)/xdg/autostart
+default_session_DATA = at-spi-dbus-bus.desktop
+EXTRA_DIST = \
+ accessibility.conf \
+ at-spi-dbus-bus.desktop
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bus/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --foreign bus/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+at-spi-dbus-bus: $(top_builddir)/config.status $(srcdir)/at-spi-dbus-bus.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-atspidbusSCRIPTS: $(atspidbus_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(atspidbusdir)" || $(MKDIR_P) "$(DESTDIR)$(atspidbusdir)"
+ @list='$(atspidbus_SCRIPTS)'; test -n "$(atspidbusdir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n' \
+ -e 'h;s|.*|.|' \
+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+ if (++n[d] == $(am__install_max)) { \
+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+ else { print "f", d "/" $$4, $$1 } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(atspidbusdir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(atspidbusdir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-atspidbusSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(atspidbus_SCRIPTS)'; test -n "$(atspidbusdir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(atspidbusdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(atspidbusdir)" && rm -f $$files
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-busconfigDATA: $(busconfig_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(busconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(busconfigdir)"
+ @list='$(busconfig_DATA)'; test -n "$(busconfigdir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(busconfigdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(busconfigdir)" || exit $$?; \
+ done
+
+uninstall-busconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(busconfig_DATA)'; test -n "$(busconfigdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(busconfigdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(busconfigdir)" && rm -f $$files
+install-default_sessionDATA: $(default_session_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(default_sessiondir)" || $(MKDIR_P) "$(DESTDIR)$(default_sessiondir)"
+ @list='$(default_session_DATA)'; test -n "$(default_sessiondir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(default_sessiondir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(default_sessiondir)" || exit $$?; \
+ done
+
+uninstall-default_sessionDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(default_session_DATA)'; test -n "$(default_sessiondir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(default_sessiondir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(default_sessiondir)" && rm -f $$files
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(SCRIPTS) $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(atspidbusdir)" "$(DESTDIR)$(busconfigdir)" "$(DESTDIR)$(default_sessiondir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-atspidbusSCRIPTS install-busconfigDATA \
+ install-default_sessionDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-atspidbusSCRIPTS uninstall-busconfigDATA \
+ uninstall-default_sessionDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-atspidbusSCRIPTS install-busconfigDATA install-data \
+ install-data-am install-default_sessionDATA install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-atspidbusSCRIPTS \
+ uninstall-busconfigDATA uninstall-default_sessionDATA
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/bus/accessibility.conf new/at-spi2-core-0.1.4/bus/accessibility.conf
--- old/at-spi2-core-0.1.3/bus/accessibility.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/at-spi2-core-0.1.4/bus/accessibility.conf 2009-12-08 11:21:50.000000000 +0100
@@ -0,0 +1,40 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+ <type>accessibility</type>
+
+ <fork/>
+
+
+
+ <servicehelper>/lib/dbus-1.0/dbus-daemon-launch-helper</servicehelper>
+
+ <auth>EXTERNAL</auth>
+
+ <listen>unix:tmpdir=/tmp</listen>
+
+ <policy context="default">
+ <!-- All users can connect to system bus -->
+ <allow user="*"/>
+ <!-- Allow everything to be sent -->
+ <allow send_destination="*" eavesdrop="true"/>
+ <!-- Allow everything to be received -->
+ <allow eavesdrop="true"/>
+ <!-- Allow anyone to own anything -->
+ <allow own="*"/>
+ </policy>
+
+ <limit name="max_incoming_bytes">1000000000</limit>
+ <limit name="max_outgoing_bytes">1000000000</limit>
+ <limit name="max_message_size">1000000000</limit>
+ <limit name="service_start_timeout">120000</limit>
+ <limit name="auth_timeout">240000</limit>
+ <limit name="max_completed_connections">100000</limit>
+ <limit name="max_incomplete_connections">10000</limit>
+ <limit name="max_connections_per_user">100000</limit>
+ <limit name="max_pending_service_starts">10000</limit>
+ <limit name="max_names_per_connection">50000</limit>
+ <limit name="max_match_rules_per_connection">50000</limit>
+ <limit name="max_replies_per_connection">50000</limit>
+ <limit name="reply_timeout">300000</limit>
+</busconfig>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/bus/at-spi-dbus-bus.desktop new/at-spi2-core-0.1.4/bus/at-spi-dbus-bus.desktop
--- old/at-spi2-core-0.1.3/bus/at-spi-dbus-bus.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/at-spi2-core-0.1.4/bus/at-spi-dbus-bus.desktop 2009-12-17 22:23:34.000000000 +0100
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+_Name=AT SPI D-Bus Bus
+Exec=at-spi-dbus-bus
+OnlyShowIn=GNOME;
+NoDisplay=true
+AutostartCondition=GNOME /desktop/gnome/interface/accessibility
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/bus/at-spi-dbus-bus.in new/at-spi2-core-0.1.4/bus/at-spi-dbus-bus.in
--- old/at-spi2-core-0.1.3/bus/at-spi-dbus-bus.in 1970-01-01 01:00:00.000000000 +0100
+++ new/at-spi2-core-0.1.4/bus/at-spi-dbus-bus.in 2009-12-22 00:07:57.000000000 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+prefix=@prefix@
+sysconfdir=@sysconfdir@
+daemondir=@DBUS_DAEMONDIR@
+
+address=`${daemondir}/dbus-daemon --config-file=${sysconfdir}/at-spi2/accessibility.conf --print-address`
+xprop -root -f AT_SPI_BUS 8s -set AT_SPI_BUS ${address}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/config.h.in new/at-spi2-core-0.1.4/config.h.in
--- old/at-spi2-core-0.1.3/config.h.in 2009-11-30 17:17:55.000000000 +0100
+++ new/at-spi2-core-0.1.4/config.h.in 2009-12-22 00:28:28.000000000 +0100
@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Directory for installing the DBUS daemon */
+#undef DBUS_DAEMONDIR
+
/* Define to 1 if you have the header file. */
#undef HAVE_DLFCN_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/configure new/at-spi2-core-0.1.4/configure
--- old/at-spi2-core-0.1.3/configure 2009-11-30 17:17:44.000000000 +0100
+++ new/at-spi2-core-0.1.4/configure 2009-12-22 00:28:27.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for at-spi2-core 0.1.3.
+# Generated by GNU Autoconf 2.64 for at-spi2-core 0.1.4.
#
# Report bugs to .
#
@@ -698,8 +698,8 @@
# Identity of this package.
PACKAGE_NAME='at-spi2-core'
PACKAGE_TARNAME='at-spi2-core'
-PACKAGE_VERSION='0.1.3'
-PACKAGE_STRING='at-spi2-core 0.1.3'
+PACKAGE_VERSION='0.1.4'
+PACKAGE_STRING='at-spi2-core 0.1.4'
PACKAGE_BUGREPORT='accessibility-atspi@lists.linux-foundation.org'
PACKAGE_URL=''
@@ -745,6 +745,8 @@
LIBOBJS
LIBTOOL_EXPORT_OPTIONS
DBUS_SERVICES_DIR
+DBUS_DAEMONDIR
+EXPANDED_BINDIR
DEFAULT_ATSPI_INTROSPECTION_PATH
XEVIE_LIBS
XINPUT_LIBS
@@ -888,6 +890,7 @@
enable_libtool_lock
with_x
enable_xevie
+with_dbus_daemondir
with_dbus_services
'
ac_precious_vars='build_alias
@@ -1453,7 +1456,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 0.1.3 to adapt to many kinds of systems.
+\`configure' configures at-spi2-core 0.1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1527,7 +1530,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of at-spi2-core 0.1.3:";;
+ short | recursive ) echo "Configuration of at-spi2-core 0.1.4:";;
esac
cat <<\_ACEOF
@@ -1551,6 +1554,8 @@
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-x use the X Window System
+ --with-dbus-daemondir=dirname
+ Directory where the DBUS daemon is installed
--with-dbus-services=<dir>
where D-BUS services directory is
@@ -1647,7 +1652,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-at-spi2-core configure 0.1.3
+at-spi2-core configure 0.1.4
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2018,7 +2023,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 0.1.3, which was
+It was created by at-spi2-core $as_me 0.1.4, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -2845,7 +2850,7 @@
# Define the identity of the package.
PACKAGE='at-spi2-core'
- VERSION='0.1.3'
+ VERSION='0.1.4'
cat >>confdefs.h <<_ACEOF
@@ -4553,13 +4558,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4556: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4561: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4559: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4564: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4562: output\"" >&5)
+ (eval echo "\"\$as_me:4567: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5765,7 +5770,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5768 "configure"' > conftest.$ac_ext
+ echo '#line 5773 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7265,11 +7270,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7268: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7273: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7272: \$? = $ac_status" >&5
+ echo "$as_me:7277: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7604,11 +7609,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7607: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7612: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7611: \$? = $ac_status" >&5
+ echo "$as_me:7616: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7709,11 +7714,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7712: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7717: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7716: \$? = $ac_status" >&5
+ echo "$as_me:7721: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7764,11 +7769,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7767: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7772: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7771: \$? = $ac_status" >&5
+ echo "$as_me:7776: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10147,7 +10152,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10150 "configure"
+#line 10155 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10243,7 +10248,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10246 "configure"
+#line 10251 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12019,10 +12024,56 @@
if test -z "$DEFAULT_ATSPI_INTROSPECTION_PATH"; then
- DEFAULT_ATSPI_INTROSPECTION_PATH=dbus
+ DEFAULT_ATSPI_INTROSPECTION_PATH=at-spi2/dbus
fi
+ EXP_VAR=EXPANDED_BINDIR
+ FROM_VAR="$bindir"
+
+ prefix_save=$prefix
+ exec_prefix_save=$exec_prefix
+
+ if test "x$prefix" = "xNONE"; then
+ prefix="$ac_default_prefix"
+ fi
+ if test "x$exec_prefix" = "xNONE"; then
+ exec_prefix=$prefix
+ fi
+
+ full_var="$FROM_VAR"
+ while true; do
+ new_full_var="`eval echo $full_var`"
+ if test "x$new_full_var" = "x$full_var"; then break; fi
+ full_var=$new_full_var
+ done
+
+ full_var=$new_full_var
+ EXPANDED_BINDIR="$full_var"
+
+
+ prefix=$prefix_save
+ exec_prefix=$exec_prefix_save
+
+
+# Check whether --with-dbus_daemondir was given.
+if test "${with_dbus_daemondir+set}" = set; then :
+ withval=$with_dbus_daemondir;
+fi
+
+if test -z "$with_dbus_daemondir" ; then
+ DBUS_DAEMONDIR=$EXPANDED_BINDIR
+else
+ DBUS_DAEMONDIR=$with_dbus_daemondir
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define DBUS_DAEMONDIR "$DBUS_DAEMONDIR"
+_ACEOF
+
+
+
# Check whether --with-dbus-services was given.
if test "${with_dbus_services+set}" = set; then :
withval=$with_dbus_services;
@@ -12037,7 +12088,7 @@
-ac_config_files="$ac_config_files Makefile xml/Makefile tools/Makefile registryd/Makefile"
+ac_config_files="$ac_config_files Makefile xml/Makefile tools/Makefile bus/Makefile bus/at-spi-dbus-bus registryd/Makefile"
cat >confcache <<\_ACEOF
@@ -12561,7 +12612,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 0.1.3, which was
+This file was extended by at-spi2-core $as_me 0.1.4, which was
generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12625,7 +12676,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-at-spi2-core config.status 0.1.3
+at-spi2-core config.status 0.1.4
configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -13007,6 +13058,8 @@
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"xml/Makefile") CONFIG_FILES="$CONFIG_FILES xml/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+ "bus/Makefile") CONFIG_FILES="$CONFIG_FILES bus/Makefile" ;;
+ "bus/at-spi-dbus-bus") CONFIG_FILES="$CONFIG_FILES bus/at-spi-dbus-bus" ;;
"registryd/Makefile") CONFIG_FILES="$CONFIG_FILES registryd/Makefile" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/configure.ac new/at-spi2-core-0.1.4/configure.ac
--- old/at-spi2-core-0.1.3/configure.ac 2009-11-30 17:16:59.000000000 +0100
+++ new/at-spi2-core-0.1.4/configure.ac 2009-12-22 00:12:05.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-core], [0.1.3], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-core], [0.1.4], [accessibility-atspi@lists.linux-foundation.org])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
@@ -107,9 +107,19 @@
[Set the default path for the install ofDBus introspection XML
relative to the pkgdatadir.])
if test -z "$DEFAULT_ATSPI_INTROSPECTION_PATH"; then
- DEFAULT_ATSPI_INTROSPECTION_PATH=dbus
+ DEFAULT_ATSPI_INTROSPECTION_PATH=at-spi2/dbus
fi
+AS_AC_EXPAND(EXPANDED_BINDIR, "$bindir")
+AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory where the DBUS daemon is installed]))
+if test -z "$with_dbus_daemondir" ; then
+ DBUS_DAEMONDIR=$EXPANDED_BINDIR
+else
+ DBUS_DAEMONDIR=$with_dbus_daemondir
+fi
+AC_SUBST(DBUS_DAEMONDIR)
+AC_DEFINE_UNQUOTED(DBUS_DAEMONDIR,"$DBUS_DAEMONDIR", [Directory for installing the DBUS daemon])
+
AC_ARG_WITH(dbus-services,
[AC_HELP_STRING([--with-dbus-services=<dir>],
[where D-BUS services directory is])])
@@ -125,6 +135,8 @@
AC_CONFIG_FILES([Makefile
xml/Makefile
tools/Makefile
+ bus/Makefile
+ bus/at-spi-dbus-bus
registryd/Makefile])
AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/m4/as-ac-expend.m4 new/at-spi2-core-0.1.4/m4/as-ac-expend.m4
--- old/at-spi2-core-0.1.3/m4/as-ac-expend.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/at-spi2-core-0.1.4/m4/as-ac-expend.m4 2009-12-22 00:14:49.000000000 +0100
@@ -0,0 +1,49 @@
+dnl as-ac-expand.m4 0.2.0 -*- autoconf -*-
+dnl autostars m4 macro for expanding directories using configure's prefix
+
+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+
+dnl example:
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+ EXP_VAR=[$1]
+ FROM_VAR=[$2]
+
+ dnl first expand prefix and exec_prefix if necessary
+ prefix_save=$prefix
+ exec_prefix_save=$exec_prefix
+
+ dnl if no prefix given, then use /usr/local, the default prefix
+ if test "x$prefix" = "xNONE"; then
+ prefix="$ac_default_prefix"
+ fi
+ dnl if no exec_prefix given, then use prefix
+ if test "x$exec_prefix" = "xNONE"; then
+ exec_prefix=$prefix
+ fi
+
+ full_var="$FROM_VAR"
+ dnl loop until it doesn't change anymore
+ while true; do
+ new_full_var="`eval echo $full_var`"
+ if test "x$new_full_var" = "x$full_var"; then break; fi
+ full_var=$new_full_var
+ done
+
+ dnl clean up
+ full_var=$new_full_var
+ AC_SUBST([$1], "$full_var")
+
+ dnl restore prefix and exec_prefix
+ prefix=$prefix_save
+ exec_prefix=$exec_prefix_save
+])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/registryd/Makefile.in new/at-spi2-core-0.1.4/registryd/Makefile.in
--- old/at-spi2-core-0.1.3/registryd/Makefile.in 2009-11-30 17:17:43.000000000 +0100
+++ new/at-spi2-core-0.1.4/registryd/Makefile.in 2009-12-22 00:28:29.000000000 +0100
@@ -39,10 +39,10 @@
subdir = registryd
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expend.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -123,6 +123,7 @@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_LIBS = @DBUS_LIBS@
@@ -137,6 +138,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+EXPANDED_BINDIR = @EXPANDED_BINDIR@
FGREP = @FGREP@
GDK_CFLAGS = @GDK_CFLAGS@
GDK_LIBS = @GDK_LIBS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/registryd/org.freedesktop.atspi.Registry.service.in new/at-spi2-core-0.1.4/registryd/org.freedesktop.atspi.Registry.service.in
--- old/at-spi2-core-0.1.3/registryd/org.freedesktop.atspi.Registry.service.in 2009-11-17 19:29:18.000000000 +0100
+++ new/at-spi2-core-0.1.4/registryd/org.freedesktop.atspi.Registry.service.in 2009-12-14 11:21:30.000000000 +0100
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.freedesktop.atspi.Registry
-Exec=@LIBEXECDIR@/at-spi2-registryd
+Exec=@LIBEXECDIR@/at-spi2-registryd --use-gnome-session
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/registryd/registry-main.c new/at-spi2-core-0.1.4/registryd/registry-main.c
--- old/at-spi2-core-0.1.3/registryd/registry-main.c 2009-11-30 17:16:59.000000000 +0100
+++ new/at-spi2-core-0.1.4/registryd/registry-main.c 2009-12-18 14:05:23.000000000 +0100
@@ -39,18 +39,20 @@
static GMainLoop *mainloop;
static gchar *dbus_name = NULL;
-
-static DBusGConnection *bus_connection = NULL;
-static DBusGProxy *sm_proxy = NULL;
-static char *client_id = NULL;
-static DBusGProxy *client_proxy = NULL;
+static gboolean use_gnome_session = FALSE;
static GOptionEntry optentries[] =
{
{"dbus-name", 0, 0, G_OPTION_ARG_STRING, &dbus_name, "Well-known name to register with D-Bus", NULL},
+ {"use-gnome-session", 0, 0, G_OPTION_ARG_NONE, &use_gnome_session, "Should register with gnome session manager", NULL},
{NULL}
};
+static DBusGConnection *bus_connection = NULL;
+static DBusGProxy *sm_proxy = NULL;
+static char *client_id = NULL;
+static DBusGProxy *client_proxy = NULL;
+
#define SM_DBUS_NAME "org.gnome.SessionManager"
#define SM_DBUS_PATH "/org/gnome/SessionManager"
#define SM_DBUS_INTERFACE "org.gnome.SessionManager"
@@ -170,6 +172,108 @@
return TRUE;
}
+/*---------------------------------------------------------------------------*/
+
+/*
+ * Returns a 'canonicalized' value for DISPLAY,
+ * with the screen number stripped off if present.
+ *
+ */
+static const gchar*
+spi_display_name (void)
+{
+ static const char *canonical_display_name = NULL;
+ if (!canonical_display_name)
+ {
+ const gchar *display_env = g_getenv ("AT_SPI_DISPLAY");
+ if (!display_env)
+ {
+ display_env = g_getenv ("DISPLAY");
+ if (!display_env || !display_env[0])
+ canonical_display_name = ":0";
+ else
+ {
+ gchar *display_p, *screen_p;
+ canonical_display_name = g_strdup (display_env);
+ display_p = strrchr (canonical_display_name, ':');
+ screen_p = strrchr (canonical_display_name, '.');
+ if (screen_p && display_p && (screen_p > display_p))
+ {
+ *screen_p = '\0';
+ }
+ }
+ }
+ else
+ {
+ canonical_display_name = display_env;
+ }
+ }
+ return canonical_display_name;
+}
+
+/*---------------------------------------------------------------------------*/
+
+/*
+ * Gets the IOR from the XDisplay.
+ * Not currently used in D-Bus version, but something similar
+ * may be employed in the future for accessing the registry daemon
+ * bus name.
+ */
+
+static DBusConnection *
+spi_get_bus (void)
+{
+ Atom AT_SPI_BUS;
+ Atom actual_type;
+ Display *bridge_display;
+ int actual_format;
+ unsigned char *data = NULL;
+ unsigned long nitems;
+ unsigned long leftover;
+
+ DBusConnection *bus = NULL;
+ DBusError error;
+
+ bridge_display = XOpenDisplay (spi_display_name ());
+ if (!bridge_display)
+ g_error ("AT_SPI: Could not get the display");
+
+ AT_SPI_BUS = XInternAtom (bridge_display, "AT_SPI_BUS", FALSE);
+ XGetWindowProperty(bridge_display,
+ XDefaultRootWindow (bridge_display),
+ AT_SPI_BUS, 0L,
+ (long)BUFSIZ, False,
+ (Atom) 31, &actual_type, &actual_format,
+ &nitems, &leftover, &data);
+
+ dbus_error_init (&error);
+
+ if (data == NULL)
+ {
+ g_warning ("AT-SPI: Accessibility bus bus not found - Using session bus.\n");
+ bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
+ if (!bus)
+ g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
+ }
+ else
+ {
+ bus = dbus_connection_open (data, &error);
+ if (!bus)
+ {
+ g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
+ }
+ else
+ {
+ if (!dbus_bus_register (bus, &error))
+ g_error ("AT-SPI: Couldn't register with bus: %s\n");
+ }
+ }
+
+ return bus;
+}
+
+/*---------------------------------------------------------------------------*/
+
int
main (int argc, char **argv)
{
@@ -177,7 +281,7 @@
SpiDEController *dec;
gchar *introspection_directory;
- DBusConnection *bus;
+ DBusConnection *bus = NULL;
GOptionContext *opt;
@@ -202,13 +306,14 @@
dbus_error_init (&error);
bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
+ bus = spi_get_bus ();
if (!bus)
{
- g_warning("Couldn't connect to dbus: %s\n", error.message);
+ return 0;
}
mainloop = g_main_loop_new (NULL, FALSE);
- dbus_connection_setup_with_g_main(bus, g_main_context_default());
+ dbus_connection_setup_with_g_main(bus, NULL);
ret = dbus_bus_request_name(bus, dbus_name, DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS)
@@ -228,14 +333,13 @@
registry = spi_registry_new (bus);
dec = spi_registry_dec_new (registry, bus);
- if (!session_manager_connect ())
+ if (use_gnome_session)
{
- g_warning ("Unable to connect to session manager");
- }
+ if (!session_manager_connect ())
+ g_warning ("Unable to connect to session manager");
- if (!register_client ())
- {
- g_warning ("Unable to register client with session manager");
+ if (!register_client ())
+ g_warning ("Unable to register client with session manager");
}
g_main_loop_run (mainloop);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/tools/Makefile.in new/at-spi2-core-0.1.4/tools/Makefile.in
--- old/at-spi2-core-0.1.3/tools/Makefile.in 2009-11-30 17:17:43.000000000 +0100
+++ new/at-spi2-core-0.1.4/tools/Makefile.in 2009-12-22 00:28:29.000000000 +0100
@@ -36,10 +36,10 @@
subdir = tools
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expend.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -64,6 +64,7 @@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_LIBS = @DBUS_LIBS@
@@ -78,6 +79,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+EXPANDED_BINDIR = @EXPANDED_BINDIR@
FGREP = @FGREP@
GDK_CFLAGS = @GDK_CFLAGS@
GDK_LIBS = @GDK_LIBS@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/xml/Makefile.am new/at-spi2-core-0.1.4/xml/Makefile.am
--- old/at-spi2-core-0.1.3/xml/Makefile.am 2009-11-17 19:29:19.000000000 +0100
+++ new/at-spi2-core-0.1.4/xml/Makefile.am 2009-12-17 23:30:35.000000000 +0100
@@ -40,5 +40,5 @@
@mkdir -p introspection
xsltproc ../tools/spec-to-introspect.xsl $< |sed -e 's@xmlns:tp="http://telepathy\.freedesktop\.org/wiki/DbusSpec.extensions-v0"@@g' >$@
-introspectdir = $(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)
+introspectdir = $(datarootdir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)
dist_introspect_DATA = $(INTROSPECT_FILES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/at-spi2-core-0.1.3/xml/Makefile.in new/at-spi2-core-0.1.4/xml/Makefile.in
--- old/at-spi2-core-0.1.3/xml/Makefile.in 2009-11-30 17:17:43.000000000 +0100
+++ new/at-spi2-core-0.1.4/xml/Makefile.in 2009-12-22 00:28:29.000000000 +0100
@@ -38,10 +38,10 @@
DIST_COMMON = $(dist_introspect_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/as-ac-expend.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -89,6 +89,7 @@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DBUS_CFLAGS = @DBUS_CFLAGS@
+DBUS_DAEMONDIR = @DBUS_DAEMONDIR@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DBUS_LIBS = @DBUS_LIBS@
@@ -103,6 +104,7 @@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+EXPANDED_BINDIR = @EXPANDED_BINDIR@
FGREP = @FGREP@
GDK_CFLAGS = @GDK_CFLAGS@
GDK_LIBS = @GDK_LIBS@
@@ -246,7 +248,7 @@
BUILT_SOURCES = spec.xml
CLEANFILES = spec.xml
INTROSPECT_FILES = $(addprefix introspection/,$(patsubst %.xml,%,$(filter org.freedesktop.atspi%,$(XML_SPEC))))
-introspectdir = $(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)
+introspectdir = $(datarootdir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)
dist_introspect_DATA = $(INTROSPECT_FILES)
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
++++++ at-spi2-core-dbus-path.patch ++++++
Index: at-spi2-core-0.1.4/bus/accessibility.conf
===================================================================
--- at-spi2-core-0.1.4.orig/bus/accessibility.conf
+++ at-spi2-core-0.1.4/bus/accessibility.conf
@@ -7,7 +7,7 @@
- <servicehelper>/lib/dbus-1.0/dbus-daemon-launch-helper</servicehelper>
+ <servicehelper>/lib/dbus-1/dbus-daemon-launch-helper</servicehelper>
<auth>EXTERNAL</auth>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org