Hello community, here is the log from the commit of package libgail-gnome for openSUSE:Factory checked in at Mon May 30 12:22:35 CEST 2011.
-------- --- GNOME/libgail-gnome/libgail-gnome.changes 2011-02-18 12:44:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/libgail-gnome/libgail-gnome.changes 2011-05-27 01:35:43.000000000 +0200 @@ -1,0 +2,31 @@ +Fri May 27 01:08:54 CEST 2011 - [email protected] + +- Fix the build by removing support for panel applets from the GTK+ + module: + + rationale: this support is for bonobo applets, that are gone + with GNOME 3. + + this is a better solution than just removing the package, as + the GTK+ module provides accessibility support for other + libraries than just the panel applet. + + introduce a %build_applet define to easily control this + behavior, in case we get the libpanel-applet-2 library back + later on. + + add libgail-no-applet.patch to remove the code. + + conditionally use pkgconfig(libpanelapplet-2.0) BuildRequires + and apply above patch, based on %build_applet. +- Drop libgail-gnome-decl.patch: this is not needed as + panel_applet_accessible_new() not mentioned anywhere in the code. +- Remove explicit Requires for atk-devel, gtk2-devel, + libbonoboui-devel in devel subpackage: they will automatically be + added the pkgconfig() way. + +------------------------------------------------------------------- +Wed May 18 20:32:00 CEST 2011 - [email protected] + +- Update to version 1.20.4: + + bgo#643173: init bonobo before use it. +- Change gnome-panel-devel BuildRequires to + pkgconfig(libpanelapplet-2.0). +- Clean spec file with spec-cleaner. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libgail-gnome-1.20.3.tar.bz2 libgail-gnome-decl.patch New: ---- libgail-gnome-1.20.4.tar.bz2 libgail-no-applet.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgail-gnome.spec ++++++ --- /var/tmp/diff_new_pack.ZGZj9z/_old 2011-05-30 12:21:48.000000000 +0200 +++ /var/tmp/diff_new_pack.ZGZj9z/_new 2011-05-30 12:21:48.000000000 +0200 @@ -15,25 +15,37 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild +%define build_applet 0 Name: libgail-gnome -BuildRequires: at-spi-devel atk-devel gail-devel gconf2-devel gnome-common gnome-panel-devel gtk2-devel libbonobo-devel libbonoboui-devel libgnomeui-devel -Version: 1.20.3 -Release: 5 -Url: http://www.gnome.org/ -Group: System/GUI/GNOME +Version: 1.20.4 +Release: 1 License: LGPLv2.1+ Summary: GNOME Accessibility Implementation Library for gnomeui and libbonoboui +Url: http://www.gnome.org/ +Group: System/GUI/GNOME Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.20/%{name}-%{version}.tar.bz2 Source99: baselibs.conf -Patch: libgail-gnome-decl.patch # PATCH-FIX-UPSTREAM libgail-no-bonobo-applet-in-panel.patch bnc#667873 [email protected] -- Avoid at all cost using anything from libpanel-applet if we're inside the gnome-panel process, to avoid a conflict between bonobo-based and dbus-based libraries (they share symbol names) Patch1: libgail-no-bonobo-applet-in-panel.patch -AutoReqProv: on -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-UPSTREAM libgail-no-applet.patch bgo#651200 [email protected] -- Remove support for panel applets: those are bonobo applets (libpanel-applet-2), which are gone with GNOME 3. +Patch2: libgail-no-applet.patch +BuildRequires: at-spi-devel +BuildRequires: atk-devel +BuildRequires: gail-devel +BuildRequires: gconf2-devel +# Needed for patch1 and patch2 +BuildRequires: gnome-common +BuildRequires: gtk2-devel +BuildRequires: libbonobo-devel +BuildRequires: libbonoboui-devel +BuildRequires: libgnomeui-devel +%if %{build_applet} +BuildRequires: pkgconfig(libpanelapplet-2.0) +%endif Supplements: packageand(gnome2-SuSE:gail) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq %description @@ -42,9 +54,9 @@ %package devel License: LGPLv2.1+ -Group: System/GUI/GNOME Summary: GNOME Accessibility Implementation Library for gnomeui and libbonoboui -Requires: %{name} = %{version} atk-devel gtk2-devel libbonoboui-devel +Group: System/GUI/GNOME +Requires: %{name} = %{version} %description devel This package contains an implementation of the ATK interfaces for GNOME @@ -52,14 +64,17 @@ %prep %setup -q -%patch +%if %{build_applet} %patch1 -p1 +%else +%patch2 -p1 +%endif %build -# Needed for patch1 +# Needed for patch1 and patch2 autoreconf -fi %configure --disable-static -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install %makeinstall @@ -67,7 +82,7 @@ %find_gconf_schemas %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %pre -f %{name}.schemas_pre ++++++ libgail-gnome-1.20.3.tar.bz2 -> libgail-gnome-1.20.4.tar.bz2 ++++++ ++++ 2459 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/libgail-gnome-1.20.3/NEWS new/libgail-gnome-1.20.4/NEWS --- old/libgail-gnome-1.20.3/NEWS 2010-06-21 15:21:49.000000000 +0200 +++ new/libgail-gnome-1.20.4/NEWS 2011-02-24 10:20:11.000000000 +0100 @@ -1,3 +1,8 @@ +What's new in version 1.20.4: +============================= + +* bugfix for #643173 (init bonobo before use it). + What's new in version 1.20.3: ============================= 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/libgail-gnome-1.20.3/README new/libgail-gnome-1.20.4/README --- old/libgail-gnome-1.20.3/README 2010-04-06 13:37:14.000000000 +0200 +++ new/libgail-gnome-1.20.4/README 2011-02-24 10:20:21.000000000 +0100 @@ -1,4 +1,4 @@ -Version 1.20.2. +Version 1.20.4. This directory contains the LIBGAIL-GNOME library. For more information about GAIL and accessibility in GNOME, see: 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/libgail-gnome-1.20.3/configure.in new/libgail-gnome-1.20.4/configure.in --- old/libgail-gnome-1.20.3/configure.in 2010-06-21 15:18:46.000000000 +0200 +++ new/libgail-gnome-1.20.4/configure.in 2011-02-24 09:43:58.000000000 +0100 @@ -2,7 +2,7 @@ m4_define([gail_gnome_major_version], [1]) m4_define([gail_gnome_minor_version], [20]) -m4_define([gail_gnome_micro_version], [3]) +m4_define([gail_gnome_micro_version], [4]) m4_define([gail_gnome_interface_age], [3]) m4_define([gail_gnome_binary_age], [3]) m4_define([gail_gnome_version], 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/libgail-gnome-1.20.3/gail-gnome/bonobo-accessibility-init.c new/libgail-gnome-1.20.4/gail-gnome/bonobo-accessibility-init.c --- old/libgail-gnome-1.20.3/gail-gnome/bonobo-accessibility-init.c 2009-04-22 00:57:02.000000000 +0200 +++ new/libgail-gnome-1.20.4/gail-gnome/bonobo-accessibility-init.c 2011-02-24 09:54:53.000000000 +0100 @@ -130,6 +130,7 @@ { debug_printf ("BonoboUI Accessibility Module loaded\n"); + bonobo_init(argc, argv); gail_accessibility_init (); return 0; ++++++ libgail-no-applet.patch ++++++ commit 2aad6b418764a4783768d7800c43c8a6b9a85cb8 Author: Vincent Untz <[email protected]> Date: Fri May 27 01:30:49 2011 +0200 Make libpanel-applet dependency optional There might be a need for libgail-gnome in GNOME 3, in case there's still something using bonobo outside of the panel applets. To support libgail-gnome in GNOME 3, we need to make the libpanel-applet dependency optional. https://bugzilla.gnome.org/show_bug.cgi?id=651200 diff --git a/configure.in b/configure.in index 1a2b0e2..dbf1a89 100644 --- a/configure.in +++ b/configure.in @@ -124,8 +124,11 @@ PKG_CHECK_MODULES([DEPS],[ $LIBBONOBO_PACKAGES >= $LIBBONOBO_REQUIRED_VERSION $LIBBONOBOUI_PACKAGES >= $LIBBONOBO_REQUIRED_VERSION $LIBGNOMEUI_PACKAGES >= $LIBGNOMEUI_REQUIRED_VERSION - $AT_SPI_PACKAGES >= $AT_SPI_REQUIRED_VERSION - $PANEL_APPLET_PACKAGES >= $PANEL_APPLET_REQUIRED_VERSION]) + $AT_SPI_PACKAGES >= $AT_SPI_REQUIRED_VERSION]) + +PKG_CHECK_MODULES([PANEL_APPLET], + [$PANEL_APPLET_PACKAGES >= $PANEL_APPLET_REQUIRED_VERSION], + [have_panel_applet=yes], [have_panel_applet=no]) PKG_CHECK_MODULES([TEST],[ $ATK_PACKAGES >= $ATK_REQUIRED_VERSION @@ -134,14 +137,20 @@ PKG_CHECK_MODULES([TEST],[ $LIBBONOBOUI_PACKAGES >= $LIBBONOBO_REQUIRED_VERSION $LIBGNOMEUI_PACKAGES >= $LIBGNOMEUI_REQUIRED_VERSION $AT_SPI_PACKAGES >= $AT_SPI_REQUIRED_VERSION - $CSPI_PACKAGES >= $CSPI_REQUIRED_VERSION - $PANEL_APPLET_PACKAGES >= $PANEL_APPLET_REQUIRED_VERSION]) + $CSPI_PACKAGES >= $CSPI_REQUIRED_VERSION]) AC_SUBST([DEPS_CFLAGS]) AC_SUBST([DEPS_LIBS]) +AC_SUBST([PANEL_APPLET_CFLAGS]) +AC_SUBST([PANEL_APPLET_LIBS]) AC_SUBST([TEST_CFLAGS]) AC_SUBST([TEST_LIBS]) +AM_CONDITIONAL(HAVE_PANEL_APPLET, test "x$have_panel_applet" = "xyes") +if test "x$have_panel_applet" = "xyes" ; then + AC_DEFINE(HAVE_PANEL_APPLET, 1, [Defined if libpanel-applet support is enabled]) +fi + AC_SUBST([AM_CPPFLAGS]) AC_SUBST([AM_CFLAGS]) AC_SUBST([AM_LDFLAGS]) diff --git a/gail-gnome/Makefile.am b/gail-gnome/Makefile.am index cacfc86..6242d79 100644 --- a/gail-gnome/Makefile.am +++ b/gail-gnome/Makefile.am @@ -8,8 +8,6 @@ gailgnome_c_sources = \ bonobo_plug_atk_object_factory.c \ bonobo_socket_atk_object.c \ bonobo_socket_atk_object_factory.c \ - panel-applet-atk-object-factory.c \ - panel-applet-atk-object.c \ bonobo-accessibility-init.c gailgnome_private_h_sources = \ @@ -19,10 +17,18 @@ gailgnome_private_h_sources = \ bonobo_plug_atk_object_factory.h \ bonobo_socket_atk_object.h \ bonobo_socket_atk_object_factory.h \ - panel-applet-atk-object.h \ - panel-applet-atk-object-factory.h \ gail-gnome-debug.h +if HAVE_PANEL_APPLET +gailgnome_c_sources += \ + panel-applet-atk-object-factory.c \ + panel-applet-atk-object.c + +gailgnome_private_h_sources += \ + panel-applet-atk-object.h \ + panel-applet-atk-object-factory.h +endif + gailgnome_public_h_sources = libgail_gnome_la_SOURCES = \ @@ -36,6 +42,7 @@ libgail_gnome_la_CPPFLAGS = \ libgail_gnome_la_CFLAGS = \ $(DEPS_CFLAGS) \ + $(PANEL_APPLET_CFLAGS) \ $(GAIL_GNOME_DEBUG_CFLAGS) \ $(WARN_CFLAGS) \ $(AM_CFLAGS) @@ -46,4 +53,5 @@ libgail_gnome_la_LDFLAGS = \ $(AM_LDFLAGS) libgail_gnome_la_LIBADD = \ - $(DEPS_LIBS) + $(DEPS_LIBS) \ + $(PANEL_APPLET_LIBS) diff --git a/gail-gnome/bonobo-accessibility-init.c b/gail-gnome/bonobo-accessibility-init.c index f3658d0..fe2ba32 100644 --- a/gail-gnome/bonobo-accessibility-init.c +++ b/gail-gnome/bonobo-accessibility-init.c @@ -26,13 +26,17 @@ #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-exception.h> #include <bonobo/bonobo-control-frame.h> +#ifdef HAVE_PANEL_APPLET #include <panel-applet.h> +#endif #include <libspi/accessible.h> #include "bonobo-control-accessible.h" #include "bonobo-control-frame-accessible.h" #include "bonobo_plug_atk_object_factory.h" #include "bonobo_socket_atk_object_factory.h" +#ifdef HAVE_PANEL_APPLET #include "panel-applet-atk-object-factory.h" +#endif #include "gail-gnome-debug.h" #define GNOME_ACCESSIBILITY_ENV "GNOME_ACCESSIBILITY" @@ -93,7 +97,9 @@ gail_bonobo_ui_register_atk_factories (void) AtkRegistry *registry = atk_get_default_registry (); atk_registry_set_factory_type (registry, BONOBO_TYPE_PLUG, BONOBO_TYPE_PLUG_ATK_OBJECT_FACTORY); atk_registry_set_factory_type (registry, BONOBO_TYPE_SOCKET, BONOBO_TYPE_SOCKET_ATK_OBJECT_FACTORY); +#ifdef HAVE_PANEL_APPLET atk_registry_set_factory_type (registry, PANEL_TYPE_APPLET, PANEL_APPLET_TYPE_ATK_OBJECT_FACTORY); +#endif } static void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
