Hello community, here is the log from the commit of package notify-osd for openSUSE:Factory checked in at 2020-03-01 21:28:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/notify-osd (Old) and /work/SRC/openSUSE:Factory/.notify-osd.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notify-osd" Sun Mar 1 21:28:15 2020 rev:26 rq:780573 version:0.9.35~bzr20191129 Changes: -------- --- /work/SRC/openSUSE:Factory/notify-osd/notify-osd.changes 2017-03-02 19:43:37.426248293 +0100 +++ /work/SRC/openSUSE:Factory/.notify-osd.new.26092/notify-osd.changes 2020-03-01 21:28:33.348622512 +0100 @@ -1,0 +2,8 @@ +Sat Feb 22 15:48:43 UTC 2020 - Alexei Sorokin <[email protected]> + +- Update to version 0.9.35~bzr20191129: + * Support "image-path" as hint (lp#1840741). +- Rebase notify-osd-leolik.patch. +- Drop support for old openSUSE versions. + +------------------------------------------------------------------- Old: ---- notify-osd_0.9.35+16.04.20160415.orig.tar.gz New: ---- notify-osd_0.9.35+20.04.20191129.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notify-osd.spec ++++++ --- /var/tmp/diff_new_pack.Ii7zal/_old 2020-03-01 21:28:34.212624266 +0100 +++ /var/tmp/diff_new_pack.Ii7zal/_new 2020-03-01 21:28:34.216624275 +0100 @@ -1,7 +1,7 @@ # # spec file for package notify-osd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define _version 0.9.35+16.04.20160415 +%define _version 0.9.35+20.04.20191129 Name: notify-osd -Version: 0.9.35~bzr20160415 +Version: 0.9.35~bzr20191129 Release: 0 Summary: Streamlined Notification Daemon -License: GPL-3.0+ -Group: System/X11/Utilities -Url: https://launchpad.net/notify-osd +License: GPL-3.0-or-later +URL: https://launchpad.net/notify-osd Source: https://launchpad.net/ubuntu/+archive/primary/+files/%{name}_%{_version}.orig.tar.gz # PATCH-FEATURE-OPENSUSE notify-osd-leolik.patch -- Extend the configuration capabilities, patch by Roman Sukochev (Leolik) from https://launchpad.net/~leolik/+archive/leolik. Patch0: %{name}-leolik.patch -# PATCH-FIX-UPSTREAM notify-osd-fix-workarea.patch [email protected] -- Fix workarea on Gtk 3.22+. -Patch1: %{name}-fix-workarea.patch # PATCH-FIX-UPSTREAM notify-osd-fix-voidreturn.patch [email protected] -- Fix value non-return in display.c stack_layout(). -Patch2: %{name}-fix-voidreturn.patch +Patch1: %{name}-fix-voidreturn.patch +# PATCH-FIX-UPSTREAM notify-osd-fix-workarea.patch [email protected] -- Fix workarea on GTK+ 3.22.[0-21]. +Patch2: %{name}-fix-workarea.patch BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.8 BuildRequires: fdupes @@ -61,24 +60,20 @@ %patch1 -p1 %patch2 -p1 +cp %{_datadir}/automake*/COPYING . + %build NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-schemas-compile -make %{?_smp_mflags} V=1 +%make_build %install %make_install %fdupes %{buildroot}%{_datadir}/ -%post -%glib2_gsettings_schema_post - -%postun -%glib2_gsettings_schema_postun - %files -%defattr(-,root,root) +%license COPYING %doc AUTHORS NEWS README TODO %{_libexecdir}/%{name} %{_datadir}/%{name}/ ++++++ notify-osd-leolik.patch ++++++ --- /var/tmp/diff_new_pack.Ii7zal/_old 2020-03-01 21:28:34.252624348 +0100 +++ /var/tmp/diff_new_pack.Ii7zal/_new 2020-03-01 21:28:34.252624348 +0100 @@ -651,7 +651,7 @@ if (new_bubble && bubble_is_append_allowed(bubble)) { app_bubble = find_bubble_for_append(self, bubble); -@@ -984,8 +994,54 @@ +@@ -992,8 +1002,54 @@ case SLOT_ALLOCATION_FIXED: *y += EM2PIXELS (defaults_get_icon_size (d), d) + 2 * EM2PIXELS (defaults_get_margin_size (d), d) + @@ -708,7 +708,7 @@ break; case SLOT_ALLOCATION_DYNAMIC: -@@ -1001,6 +1057,114 @@ +@@ -1009,6 +1065,114 @@ } break; ++++++ notify-osd_0.9.35+16.04.20160415.orig.tar.gz -> notify-osd_0.9.35+20.04.20191129.orig.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/stack.c new/src/stack.c --- old/src/stack.c 2016-04-15 13:58:38.000000000 +0200 +++ new/src/stack.c 2019-11-29 15:31:39.000000000 +0100 @@ -760,6 +760,14 @@ else g_warning ("image_path hint is not a string\n"); } + else if ((data = (GValue*) g_hash_table_lookup (hints, "image-path"))) + { + g_debug("Using image-path hint\n"); + if ((data && G_VALUE_HOLDS_STRING (data))) + bubble_set_icon (bubble, g_value_get_string(data)); + else + g_warning ("image-path hint is not a string\n"); + } else if (icon && *icon != '\0') { g_debug("Using icon parameter\n");
