Hello community, here is the log from the commit of package ido for openSUSE:Factory checked in at 2017-04-11 09:36:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ido (Old) and /work/SRC/openSUSE:Factory/.ido.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ido" Tue Apr 11 09:36:03 2017 rev:2 rq:483466 version:13.10.0+bzr20161028 Changes: -------- --- /work/SRC/openSUSE:Factory/ido/ido.changes 2016-06-13 21:55:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ido.new/ido.changes 2017-04-11 09:36:08.909487638 +0200 @@ -1,0 +2,9 @@ +Wed Mar 29 19:14:43 UTC 2017 - [email protected] + +- Update to version 13.10.0+bzr20161028: + * IdoCalendarMenuItem: disconnect from parent signals on item + destruction (lp#1506427). +- Improve and rename ido-no-ubuntu-private.patch to + ido-optional-ubuntu-private.patch. + +------------------------------------------------------------------- Old: ---- ido-no-ubuntu-private.patch ido_13.10.0+15.10.20151002.orig.tar.gz New: ---- ido-optional-ubuntu-private.patch ido_13.10.0+17.04.20161028.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ido.spec ++++++ --- /var/tmp/diff_new_pack.bOibZZ/_old 2017-04-11 09:36:09.477407412 +0200 +++ /var/tmp/diff_new_pack.bOibZZ/_new 2017-04-11 09:36:09.477407412 +0200 @@ -1,7 +1,7 @@ # # spec file for package ido # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -20,36 +20,37 @@ %define soname libido3-0.1 %define sover 0 %define typelib typelib-1_0-Ido3-0_1 -%define _version 13.10.0+15.10.20151002 +%define _version 13.10.0+17.04.20161028 Name: ido -Version: 13.10.0+bzr20151002 +Version: 13.10.0+bzr20161028 Release: 0 Summary: Indicator Display Objects License: LGPL-3.0 Group: System/Libraries Url: https://launchpad.net/ido -Source: http://archive.ubuntu.com/ubuntu/pool/main/i/%{name}/%{name}_%{_version}.orig.tar.gz +Source: https://launchpad.net/ubuntu/+archive/primary/+files/%{name}_%{_version}.orig.tar.gz Source1: baselibs.conf -# PATCH-FIX-OPENSUSE ido-no-ubuntu-private.patch -Patch0: %{name}-no-ubuntu-private.patch +# PATCH-FIX-OPENSUSE ido-optional-ubuntu-private.patch [email protected] -- Make Ubuntu GTK+ Private API optional. +Patch0: ido-optional-ubuntu-private.patch +BuildRequires: gcc-c++ BuildRequires: gnome-common +BuildRequires: pkgconfig BuildRequires: vala >= 0.16 BuildRequires: pkgconfig(glib-2.0) >= 2.14.0 BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.8.2 +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(xorg-macros) -BuildRequires: pkg-config %description Widgets and other objects used for indicators. %package -n %{lname} -Summary: Shared library providing extra gtk menu items in system indicators +Summary: Shared library providing extra GTK+ menu items in system indicators Group: System/Libraries %description -n %{lname} -Shared library providing extra gtk menu items for display in -system indicators +Shared library providing extra GTK+ menu items for display in +system indicators. This package contains shared libraries. @@ -58,13 +59,13 @@ Group: System/Libraries %description -n %{typelib} -Shared library providing extra gtk menu items for display in -system indicators +Shared library providing extra GTK+ menu items for display in +system indicators. This package provides the GObject Introspection bindings for Ido. %package devel -Summary: Shared library providing extra gtk menu items in system indicators +Summary: Shared library providing extra GTK+ menu items in system indicators Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} Requires: %{typelib} = %{version} @@ -73,19 +74,20 @@ Requires: pkgconfig(gtk+-3.0) >= 3.8.2 %description devel -Shared library providing extra gtk menu items for display in -system indicators +Shared library providing extra GTK+ menu items for display in +system indicators. This package contains shared libraries. %prep -%setup -q -n %{name}-%{_version} +%setup -q -c %patch0 -p1 %build NOCONFIGURE=1 gnome-autogen.sh -%configure -make %{?_smp_mflags} +%configure \ + --disable-ubuntu-private-api +make %{?_smp_mflags} V=1 %install %make_install ++++++ ido-optional-ubuntu-private.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -140,6 +140,16 @@ dnl = GTK Doc Check ==================== GTK_DOC_CHECK([1.8]) +dnl = GTK+ Ubuntu Private API ================================================= + +AC_ARG_ENABLE([ubuntu-private-api], + [AS_HELP_STRING([--enable-ubuntu-private-api=@<:@no/yes@:>@], + [Use Ubuntu GTK+ Private API @<:@default=yes@:>@])], + [enable_ubuntu_private_api="$enableval"], + [enable_ubuntu_private_api=yes]) + +AM_CONDITIONAL([USE_UBUNTU_PRIVATE_API], [test "x$enable_ubuntu_private_api" != xno]) + dnl =========================================================================== AC_CONFIG_FILES([ @@ -160,6 +170,7 @@ echo "" echo " Prefix : ${prefix}" echo " gcov : ${use_gcov}" echo " introspection: ${enable_introspection}" +echo " ubuntu gtk+ : ${enable_ubuntu_private_api}" echo "" echo " Documentation: ${enable_gtk_doc}" echo "" --- a/src/idomenuitemfactory.c +++ b/src/idomenuitemfactory.c @@ -17,6 +17,7 @@ * Lars Uebernickel <[email protected]> */ +#ifdef USE_UBUNTU_PRIVATE_API #include <gtk/gtk.h> #include <gtk/ubuntu-private.h> @@ -117,3 +118,4 @@ static void ido_menu_item_factory_init (IdoMenuItemFactory *factory) { } +#endif --- a/src/libido.c +++ b/src/libido.c @@ -28,9 +28,11 @@ void ido_init (void) { +#ifdef USE_UBUNTU_PRIVATE_API GType ido_menu_item_factory_get_type (void); /* make sure this extension point is registered so that gtk calls it * when finding custom menu items */ g_type_ensure (ido_menu_item_factory_get_type ()); +#endif } --- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,6 +68,10 @@ AM_CPPFLAGS = \ $(MAINTAINER_CFLAGS) \ -Wall -Werror -Wextra -Wno-unused-parameter -Wno-error=deprecated-declarations +if USE_UBUNTU_PRIVATE_API +AM_CPPFLAGS += -DUSE_UBUNTU_PRIVATE_API +endif + AM_CFLAGS = \ $(COVERAGE_CFLAGS) ++++++ ido_13.10.0+15.10.20151002.orig.tar.gz -> ido_13.10.0+17.04.20161028.orig.tar.gz ++++++ ++++ 25471 lines of diff (skipped)
