Hello community, here is the log from the commit of package libdbusmenu for openSUSE:Factory checked in at 2015-06-16 14:05:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdbusmenu (Old) and /work/SRC/openSUSE:Factory/.libdbusmenu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdbusmenu" Changes: -------- --- /work/SRC/openSUSE:Factory/libdbusmenu/libdbusmenu.changes 2014-03-22 18:02:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdbusmenu.new/libdbusmenu.changes 2015-06-16 14:05:28.000000000 +0200 @@ -1,0 +2,18 @@ +Tue May 5 13:47:23 UTC 2015 - sor.ale...@meowr.ru + +- Update to 12.10.3+bzr20150410 (changes since 12.10.3+bzr20140610): + * Use the configure-generated libtool script instead of + /usr/bin/libtool, which might not match what we have. + * Use gi's typelibdir pkgconfig variable and install into this + directory, now that gi supports multiarch. + * Parser: don't override the label for stock items if a custom + one is provided. +- Minor spec cleanup. + +------------------------------------------------------------------- +Sun Oct 26 13:19:05 UTC 2014 - p.drou...@gmail.com + +- Update to version 12.10.3+14.10.20140610 + + No changelog available + +------------------------------------------------------------------- Old: ---- libdbusmenu_12.10.3+14.04.20140217.1.orig.tar.gz New: ---- libdbusmenu_12.10.3+15.04.20150410.2.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdbusmenu.spec ++++++ --- /var/tmp/diff_new_pack.HPOkiD/_old 2015-06-16 14:05:29.000000000 +0200 +++ /var/tmp/diff_new_pack.HPOkiD/_new 2015-06-16 14:05:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libdbusmenu # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,23 @@ # -%define _soname_glib 4 -%define _soname_gtk2 4 -%define _soname_gtk3 4 -%define _soname_jsonloader 4 - +%define soname_glib 4 +%define soname_gtk2 4 +%define soname_gtk3 4 +%define soname_jsonloader 4 +%define _version 12.10.3+15.04.20150410.2 Name: libdbusmenu -Version: 12.10.3+14.04.20140217.1 +Version: 12.10.3+bzr20150410 Release: 0 Summary: Small library that passes a menu structure across DBus License: GPL-3.0 and (LGPL-2.1 or LGPL-3.0) Group: System/Libraries Url: https://launchpad.net/dbusmenu -Source: http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu/%{name}_%{version}.orig.tar.gz +Source: http://archive.ubuntu.com/ubuntu/pool/main/libd/%{name}/%{name}_%{_version}.orig.tar.gz BuildRequires: autoconf BuildRequires: automake BuildRequires: gnome-common BuildRequires: gtk-doc -BuildRequires: gtk2-devel -BuildRequires: gtk3-devel BuildRequires: intltool BuildRequires: libtool BuildRequires: pkgconfig @@ -44,125 +42,114 @@ BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gnome-doc-utils) BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(valgrind) BuildRequires: pkgconfig(x11) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -A small little library that was created by pulling out some comon code out of -indicator-applet. It passes a menu structure across DBus so that a program can -create a menu simply without worrying about how it is displayed on the other -side of the bus. - +A small little library that was created by pulling out some common +code out of mate-indicator-applet. It passes a menu structure +across D-Bus so that a program can create a menu simply without +worrying about how it is displayed on the other side of the bus. %package tools Summary: Development tools for the dbusmenu libraries Group: Development/Tools/Other -Requires: %{name}-glib%{_soname_glib} = %{version} +Requires: %{name}-glib%{soname_glib} = %{version} %description tools This packages contains the development tools for the dbusmenu libraries. - -%package glib%{_soname_glib} -Summary: Small library that passes a menu structure across DBus +%package glib%{soname_glib} +Summary: Small library that passes a menu structure across D-Bus Group: System/Libraries -%description glib%{_soname_glib} +%description glib%{soname_glib} This package contains the shared libraries for the dbusmenu-glib library. - %package -n typelib-1_0-Dbusmenu-0_4 -Summary: Small library that passes a menu structure across DBus - Introspection bindings +Summary: Small library that passes a menu structure across D-Bus -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-Dbusmenu-0_4 This package contains the GObject Introspection bindings for the dbusmenu library. - %package glib-devel Summary: Development files for libdbusmenu-glib Group: Development/Libraries/C and C++ -Requires: %{name}-glib%{_soname_glib} = %{version} -Requires: gtk2-devel +Requires: %{name}-glib%{soname_glib} = %{version} Requires: pkgconfig(dbus-glib-1) +Requires: pkgconfig(gtk+-2.0) %description glib-devel This package contains the development files for the dbusmenu-glib library. - %package glib-doc -Summary: Documentation for libdbusmenu-glib%{_soname_glib} +Summary: Documentation for libdbusmenu-glib%{soname_glib} Group: Documentation/HTML BuildArch: noarch %description glib-doc This package includes the documentation for the dbusmenu-glib library. - -%package gtk%{_soname_gtk2} -Summary: Small library that passes a menu structure across DBus - GTK2 version +%package gtk%{soname_gtk2} +Summary: Small library that passes a menu structure across D-Bus -- GTK+ 2 version Group: System/Libraries Requires: gtk2 -%description gtk%{_soname_gtk2} +%description gtk%{soname_gtk2} This package contains the shared libraries for the dbusmenu-gtk2 library. - %package -n typelib-1_0-DbusmenuGtk-0_4 -Summary: Small library that passes a menu structure across DBus - Introspection bindings +Summary: Small library that passes a menu structure across D-Bus -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-DbusmenuGtk-0_4 -This package contains the GObject Introspection bindings for the GTK 2 version +This package contains the GObject Introspection bindings for the GTK+ 2 version of the dbusmenu-gtk library. - %package gtk-devel -Summary: Development files for libdbusmenu-gtk%{_soname_gtk2} +Summary: Development files for libdbusmenu-gtk%{soname_gtk2} Group: Development/Libraries/C and C++ Requires: %{name}-glib-devel = %{version} -Requires: %{name}-gtk%{_soname_gtk2} = %{version} -Requires: gtk2-devel +Requires: %{name}-gtk%{soname_gtk2} = %{version} Requires: pkgconfig(dbus-glib-1) +Requires: pkgconfig(gtk+-2.0) %description gtk-devel This package contains the development files for the dbusmenu-gtk2 library. - -%package gtk3-%{_soname_gtk3} -Summary: Small library that passes a menu structure across DBus - GTK3 version +%package gtk3-%{soname_gtk3} +Summary: Small library that passes a menu structure across DBus -- GTK+ 3 version Group: System/Libraries -%description gtk3-%{_soname_gtk3} +%description gtk3-%{soname_gtk3} This package contains the shared libraries for the dbusmenu-gtk3 library. - %package -n typelib-1_0-DbusmenuGtk3-0_4 -Summary: Small library that passes a menu structure across DBus - Introspection bindings +Summary: Small library that passes a menu structure across D-Bus -- Introspection bindings Group: System/Libraries %description -n typelib-1_0-DbusmenuGtk3-0_4 -This package contains the GObject Introspection bindings for the GTK 3 version +This package contains the GObject Introspection bindings for the GTK+ 3 version of the dbusmenu-gtk library. - %package gtk3-devel -Summary: Development files for libdbusmenu-gtk3-%{_soname_gtk3} +Summary: Development files for libdbusmenu-gtk3-%{soname_gtk3} Group: Development/Libraries/C and C++ Requires: %{name}-glib-devel = %{version} -Requires: %{name}-gtk3-%{_soname_gtk3} = %{version} -Requires: gtk3-devel +Requires: %{name}-gtk3-%{soname_gtk3} = %{version} Requires: pkgconfig(dbus-glib-1) +Requires: pkgconfig(gtk+-3.0) %description gtk3-devel This package contains the development files for the dbusmenu-gtk3 library. - %package gtk-doc -Summary: Documentation for libdbusmenu-gtk%{_soname_gtk2} and libdbusmenu-gtk3-%{_soname_gtk3} +Summary: Documentation for libdbusmenu-gtk%{soname_gtk2} and libdbusmenu-gtk3-%{soname_gtk3} Group: Documentation/HTML BuildArch: noarch @@ -170,90 +157,83 @@ This package contains the documentation for the dbusmenu-gtk2 and dbusmenu-gtk3 libraries. - -%package jsonloader%{_soname_jsonloader} -Summary: Small library that passes a menu structure across DBus - Test library +%package jsonloader%{soname_jsonloader} +Summary: Small library that passes a menu structure across DBus -- Test library Group: System/Libraries -%description jsonloader%{_soname_jsonloader} +%description jsonloader%{soname_jsonloader} This package contains the shared libraries for dbusmenu-jsonloader, a library meant for test suites. - %package jsonloader-devel -Summary: Development files for libdbusmenu-jsonloader%{_soname_jsonloader} +Summary: Development files for libdbusmenu-jsonloader%{soname_jsonloader} Group: Development/Libraries/C and C++ Requires: %{name}-glib-devel = %{version} -Requires: %{name}-jsonloader%{_soname_jsonloader} = %{version} +Requires: %{name}-jsonloader%{soname_jsonloader} = %{version} Requires: pkgconfig(dbus-glib-1) Requires: pkgconfig(json-glib-1.0) %description jsonloader-devel This package contains the development files for the dbusmenu-jsonloader library. - %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{_version} %build + %global _configure ../configure -NOCONFIGURE=1 sh autogen.sh -export V=1 -mkdir -p build-gtk2 build-gtk3 - -pushd build-gtk2 -%configure --disable-scrollkeeper --enable-gtk-doc --enable-introspection \ - --with-gtk=2 --disable-static -make %{?_smp_mflags} -popd - -pushd build-gtk3 -%configure --disable-scrollkeeper --enable-gtk-doc --enable-introspection \ - --with-gtk=3 --disable-static -make %{?_smp_mflags} -popd +NOCONFIGURE=1 ./autogen.sh +for ver in 2 3; do + mkdir build-gtk$ver + pushd build-gtk$ver + %configure \ + --disable-static \ + --disable-scrollkeeper \ + --enable-gtk-doc \ + --enable-introspection \ + --with-gtk=$ver + make %{?_smp_mflags} + popd +done %install -pushd build-gtk2 -%make_install -popd - -pushd build-gtk3 -%make_install -popd - -# Remove libtool files -find %{buildroot} -type f -name '*.la' -delete - -# Put documentation in correct directory -install -dm755 %{buildroot}%{_docdir}/%{name}-tools/ -mv %{buildroot}%{_datadir}/doc/%{name}/README.dbusmenu-bench \ +for ver in 2 3; do + pushd build-gtk$ver + %make_install + popd +done + +find %{buildroot} -type f -name "*.la" -delete -print + +# Put documentation in correct directory. +mkdir -p %{buildroot}%{_docdir}/%{name}-tools/ +mv -f %{buildroot}%{_datadir}/doc/%{name}/README.dbusmenu-bench \ %{buildroot}%{_docdir}/%{name}-tools/ -# Put examples in correct documentation directory -install -dm755 %{buildroot}%{_docdir}/%{name}-glib-devel/examples/ -mv %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \ +# Put examples in correct documentation directory. +mkdir -p %{buildroot}%{_docdir}/%{name}-glib-devel/examples/ +mv -f %{buildroot}%{_datadir}/doc/%{name}/examples/glib-server-nomenu.c \ %{buildroot}%{_docdir}/%{name}-glib-devel/examples/ -%post glib%{_soname_glib} -p /sbin/ldconfig +%post glib%{soname_glib} -p /sbin/ldconfig -%postun glib%{_soname_glib} -p /sbin/ldconfig +%postun glib%{soname_glib} -p /sbin/ldconfig -%post gtk%{_soname_gtk2} -p /sbin/ldconfig +%post gtk%{soname_gtk2} -p /sbin/ldconfig -%postun gtk%{_soname_gtk2} -p /sbin/ldconfig +%postun gtk%{soname_gtk2} -p /sbin/ldconfig -%post gtk3-%{_soname_gtk3} -p /sbin/ldconfig +%post gtk3-%{soname_gtk3} -p /sbin/ldconfig -%postun gtk3-%{_soname_gtk3} -p /sbin/ldconfig +%postun gtk3-%{soname_gtk3} -p /sbin/ldconfig -%post jsonloader%{_soname_jsonloader} -p /sbin/ldconfig +%post jsonloader%{soname_jsonloader} -p /sbin/ldconfig -%postun jsonloader%{_soname_jsonloader} -p /sbin/ldconfig +%postun jsonloader%{soname_jsonloader} -p /sbin/ldconfig %files tools %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %{_libexecdir}/dbusmenu-bench %{_libexecdir}/dbusmenu-dumper %{_libexecdir}/dbusmenu-testapp @@ -263,19 +243,19 @@ %doc %dir %{_docdir}/%{name}-tools/ %doc %{_docdir}/%{name}-tools/README.dbusmenu-bench -%files glib%{_soname_glib} +%files glib%{soname_glib} %defattr(-,root,root) -%doc NEWS COPYING* -%{_libdir}/libdbusmenu-glib.so.%{_soname_glib}* +%doc COPYING* NEWS +%{_libdir}/libdbusmenu-glib.so.%{soname_glib}* %files -n typelib-1_0-Dbusmenu-0_4 %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %{_libdir}/girepository-1.0/Dbusmenu-0.4.typelib %files glib-devel %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %dir %{_includedir}/libdbusmenu-glib-0.4/ %dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/ %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-glib/client.h @@ -296,22 +276,22 @@ %files glib-doc %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %doc %{_datadir}/gtk-doc/html/libdbusmenu-glib/ -%files gtk%{_soname_gtk2} +%files gtk%{soname_gtk2} %defattr(-,root,root) -%doc NEWS COPYING* -%{_libdir}/libdbusmenu-gtk.so.%{_soname_gtk2}* +%doc COPYING* NEWS +%{_libdir}/libdbusmenu-gtk.so.%{soname_gtk2}* %files -n typelib-1_0-DbusmenuGtk-0_4 %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %{_libdir}/girepository-1.0/DbusmenuGtk-0.4.typelib %files gtk-devel %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %dir %{_includedir}/libdbusmenu-gtk-0.4/ %dir %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/ %{_includedir}/libdbusmenu-gtk-0.4/libdbusmenu-gtk/client.h @@ -325,19 +305,19 @@ %dir %{_datadir}/vala/vapi/ %{_datadir}/vala/vapi/DbusmenuGtk-0.4.vapi -%files gtk3-%{_soname_gtk3} +%files gtk3-%{soname_gtk3} %defattr(-,root,root) -%doc NEWS COPYING* -%{_libdir}/libdbusmenu-gtk3.so.%{_soname_gtk3}* +%doc COPYING* NEWS +%{_libdir}/libdbusmenu-gtk3.so.%{soname_gtk3}* %files -n typelib-1_0-DbusmenuGtk3-0_4 %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %{_libdir}/girepository-1.0/DbusmenuGtk3-0.4.typelib %files gtk3-devel %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %dir %{_includedir}/libdbusmenu-gtk3-0.4/ %dir %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/ %{_includedir}/libdbusmenu-gtk3-0.4/libdbusmenu-gtk/client.h @@ -353,17 +333,17 @@ %files gtk-doc %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %doc %{_datadir}/gtk-doc/html/libdbusmenu-gtk/ -%files jsonloader%{_soname_jsonloader} +%files jsonloader%{soname_jsonloader} %defattr(-,root,root) -%doc NEWS COPYING* -%{_libdir}/libdbusmenu-jsonloader.so.%{_soname_jsonloader}* +%doc COPYING* NEWS +%{_libdir}/libdbusmenu-jsonloader.so.%{soname_jsonloader}* %files jsonloader-devel %defattr(-,root,root) -%doc NEWS COPYING* +%doc COPYING* NEWS %dir %{_includedir}/libdbusmenu-glib-0.4/ %dir %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/ %{_includedir}/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/json-loader.h ++++++ libdbusmenu_12.10.3+14.04.20140217.1.orig.tar.gz -> libdbusmenu_12.10.3+15.04.20150410.2.orig.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-12.10.3+14.04.20140217.1/INSTALL new/libdbusmenu-12.10.3+15.04.20150410.2/INSTALL --- old/libdbusmenu-12.10.3+14.04.20140217.1/INSTALL 2014-02-17 19:07:21.000000000 +0100 +++ new/libdbusmenu-12.10.3+15.04.20150410.2/INSTALL 2015-04-10 23:56:10.000000000 +0200 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -304,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -362,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-12.10.3+14.04.20140217.1/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt new/libdbusmenu-12.10.3+15.04.20150410.2/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt --- old/libdbusmenu-12.10.3+14.04.20140217.1/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt 2014-02-17 19:07:21.000000000 +0100 +++ new/libdbusmenu-12.10.3+15.04.20150410.2/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt 2015-04-10 23:55:59.000000000 +0200 @@ -16,7 +16,6 @@ DBUSMENU_CLIENT_TYPES_SEPARATOR DBUSMENU_CLIENT_TYPES_IMAGE DbusmenuClient -DbusmenuClientClass DbusmenuClientTypeHandler dbusmenu_client_new dbusmenu_client_get_icon_paths @@ -26,6 +25,7 @@ dbusmenu_client_add_type_handler dbusmenu_client_add_type_handler_full <SUBSECTION Standard> +DbusmenuClientClass DBUSMENU_CLIENT DBUSMENU_IS_CLIENT DBUSMENU_TYPE_CLIENT @@ -147,7 +147,6 @@ DBUSMENU_SERVER_PROP_TEXT_DIRECTION DBUSMENU_SERVER_PROP_VERSION DbusmenuServer -DbusmenuServerClass dbusmenu_server_new dbusmenu_server_get_status dbusmenu_server_get_text_direction @@ -155,6 +154,7 @@ dbusmenu_server_set_status dbusmenu_server_set_text_direction <SUBSECTION Standard> +DbusmenuServerClass DBUSMENU_SERVER DBUSMENU_IS_SERVER DBUSMENU_TYPE_SERVER @@ -172,10 +172,10 @@ <FILE>menuitem-proxy</FILE> <TITLE>DbusmenuMenuitemProxy</TITLE> DbusmenuMenuitemProxy -DbusmenuMenuitemProxyClass dbusmenu_menuitem_proxy_new dbusmenu_menuitem_proxy_get_wrapped <SUBSECTION Standard> +DbusmenuMenuitemProxyClass DBUSMENU_MENUITEM_PROXY DBUSMENU_IS_MENUITEM_PROXY DBUSMENU_TYPE_MENUITEM_PROXY diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-glib/Makefile.am new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-glib/Makefile.am --- old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-glib/Makefile.am 2014-02-17 19:07:21.000000000 +0100 +++ new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-glib/Makefile.am 2015-04-10 23:55:59.000000000 +0200 @@ -198,7 +198,7 @@ girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) -typelibdir = $(libdir)/girepository-1.0 +typelibdir = $(INTROSPECTION_TYPELIBDIR) typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelib_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-glib/client.h new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-glib/client.h --- old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-glib/client.h 2014-02-17 19:07:21.000000000 +0100 +++ new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-glib/client.h 2015-04-10 23:55:59.000000000 +0200 @@ -183,6 +183,7 @@ */ typedef struct _DbusmenuClient DbusmenuClient; struct _DbusmenuClient { + /*< private >*/ GObject parent; /*< Private >*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-glib/menuitem-proxy.h new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-glib/menuitem-proxy.h --- old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-glib/menuitem-proxy.h 2014-02-17 19:07:21.000000000 +0100 +++ new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-glib/menuitem-proxy.h 2015-04-10 23:55:59.000000000 +0200 @@ -72,6 +72,7 @@ Public instance data for a #DbusmenuMenuitemProxy. */ struct _DbusmenuMenuitemProxy { + /*< private >*/ DbusmenuMenuitem parent; /*< Private >*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-glib/server.h new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-glib/server.h --- old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-glib/server.h 2014-02-17 19:07:21.000000000 +0100 +++ new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-glib/server.h 2015-04-10 23:55:59.000000000 +0200 @@ -151,6 +151,7 @@ */ typedef struct _DbusmenuServer DbusmenuServer; struct _DbusmenuServer { + /*< private >*/ GObject parent; /*< Private >*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-gtk/Makefile.am new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-gtk/Makefile.am --- old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-gtk/Makefile.am 2014-02-17 19:07:21.000000000 +0100 +++ new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-gtk/Makefile.am 2015-04-10 23:55:59.000000000 +0200 @@ -142,7 +142,7 @@ girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) -typelibdir = $(libdir)/girepository-1.0 +typelibdir = $(INTROSPECTION_TYPELIBDIR) typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelib_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-gtk/client.h new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-gtk/client.h --- old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-gtk/client.h 2014-02-17 19:07:21.000000000 +0100 +++ new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-gtk/client.h 2015-04-10 23:55:59.000000000 +0200 @@ -87,6 +87,7 @@ */ typedef struct _DbusmenuGtkClient DbusmenuGtkClient; struct _DbusmenuGtkClient { + /*< private >*/ DbusmenuClient parent; /*< Private >*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-gtk/parser.c new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-gtk/parser.c --- old/libdbusmenu-12.10.3+14.04.20140217.1/libdbusmenu-gtk/parser.c 2014-02-17 19:07:21.000000000 +0100 +++ new/libdbusmenu-12.10.3+15.04.20150410.2/libdbusmenu-gtk/parser.c 2015-04-10 23:56:10.000000000 +0200 @@ -886,7 +886,7 @@ const gchar * label = NULL; label = dbusmenu_menuitem_property_get (menuitem, DBUSMENU_MENUITEM_PROP_LABEL); - if (stock.label != NULL && label != NULL) { + if (stock.label != NULL && label != NULL && label[0] == '\0') { dbusmenu_menuitem_property_set (menuitem, DBUSMENU_MENUITEM_PROP_LABEL, stock.label); @@ -987,6 +987,7 @@ GtkWidget * menuitem = pdata->widget; dbusmenu_menuitem_child_delete (parent, child); + disconnect_from_widget (menuitem); RecurseContext recurse = {0}; recurse.toplevel = gtk_widget_get_toplevel(menuitem); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-12.10.3+14.04.20140217.1/tests/Makefile.am new/libdbusmenu-12.10.3+15.04.20150410.2/tests/Makefile.am --- old/libdbusmenu-12.10.3+14.04.20140217.1/tests/Makefile.am 2014-02-17 19:07:21.000000000 +0100 +++ new/libdbusmenu-12.10.3+15.04.20150410.2/tests/Makefile.am 2015-04-10 23:56:10.000000000 +0200 @@ -249,7 +249,7 @@ @echo export G_DEBUG=fatal_criticals >> $@ @echo export G_MESSAGES_DEBUG=all >> $@ @echo $(XVFB_RUN) >> $@ - @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task libtool --parameter --mode=execute --parameter $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@ + @echo $(DBUS_RUNNER) --task $(builddir)/test-json-client --wait-for org.dbusmenu.test --task-name Client --parameter $(top_builddir)/tools/dbusmenu-dumper --parameter /dev/null --task $(srcdir)/test-json-instruction-count --parameter $(builddir)/test-json-server --task-name Server --parameter $(srcdir)/test-json-01.json >> $@ @chmod +x $@ EXTRA_DIST += \ @@ -551,13 +551,13 @@ test_libdbusmenu_glib_gtkdoc: @echo "#!/bin/bash" > $@ @echo cd $(abs_top_builddir)/docs/libdbusmenu-glib/reference >> $@ - @echo gtester --verbose -k $(GTKDOC_CHECK) >> $@ + @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@ @chmod +x $@ test_libdbusmenu_gtk_gtkdoc: @echo "#!/bin/bash" > $@ @echo cd $(abs_top_builddir)/docs/libdbusmenu-gtk/reference >> $@ - @echo gtester --verbose -k $(GTKDOC_CHECK) >> $@ + @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@ @chmod +x $@ examplesdir = $(docdir)/examples/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdbusmenu-12.10.3+14.04.20140217.1/tests/test-json-server.c new/libdbusmenu-12.10.3+15.04.20150410.2/tests/test-json-server.c --- old/libdbusmenu-12.10.3+14.04.20140217.1/tests/test-json-server.c 2014-02-17 19:07:21.000000000 +0100 +++ new/libdbusmenu-12.10.3+15.04.20150410.2/tests/test-json-server.c 2015-04-10 23:56:10.000000000 +0200 @@ -36,8 +36,7 @@ g_debug("Dumping callgrind data"); CALLGRIND_DUMP_STATS_AT("exported"); CALLGRIND_STOP_INSTRUMENTATION; - g_main_loop_quit(mainloop); - return; + g_timeout_add(500, (GSourceFunc)g_main_loop_quit, mainloop); } static void
