Hello community, here is the log from the commit of package notify-osd for openSUSE:Factory checked in at 2016-01-01 19:48:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/notify-osd (Old) and /work/SRC/openSUSE:Factory/.notify-osd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notify-osd" Changes: -------- --- /work/SRC/openSUSE:Factory/notify-osd/notify-osd.changes 2015-11-26 17:04:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.notify-osd.new/notify-osd.changes 2016-01-01 19:51:20.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Dec 26 21:14:56 UTC 2015 - [email protected] + +- Update to 0.9.35~bzr20151201: + * bubble_set_icon: allow absolute paths in the icon name field + (lp#1520667). +- Add notify-osd-fix-voidreturn.patch. + +------------------------------------------------------------------- Old: ---- notify-osd_0.9.35+16.04.20151118.orig.tar.gz New: ---- notify-osd-fix-voidreturn.patch notify-osd_0.9.35+16.04.20151201.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notify-osd.spec ++++++ --- /var/tmp/diff_new_pack.WjSxV9/_old 2016-01-01 19:51:21.000000000 +0100 +++ /var/tmp/diff_new_pack.WjSxV9/_new 2016-01-01 19:51:21.000000000 +0100 @@ -16,9 +16,9 @@ # -%define _version 0.9.35+16.04.20151118 +%define _version 0.9.35+16.04.20151201 Name: notify-osd -Version: 0.9.35~bzr20151118 +Version: 0.9.35~bzr20151201 Release: 0 Summary: Streamlined Notification Daemon License: GPL-3.0+ @@ -26,7 +26,9 @@ Url: https://launchpad.net/notify-osd Source: http://archive.ubuntu.com/ubuntu/pool/main/n/notify-osd/%{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: notify-osd-leolik.patch +Patch0: %{name}-leolik.patch +# PATCH-FIX-UPSTREAM notify-osd-fix-voidreturn.patch [email protected] -- Fix value non-return in display.c stack_layout(). +Patch1: %{name}-fix-voidreturn.patch BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.8 BuildRequires: fdupes @@ -53,6 +55,7 @@ %prep %setup -q -n %{name}-%{_version} %patch0 +%patch1 -p1 %build autoreconf -fi ++++++ notify-osd-fix-voidreturn.patch ++++++ --- a/src/display.c +++ b/src/display.c @@ -288,7 +288,7 @@ stack_layout (Stack* self) gint y = 0; gint x = 0; - g_return_if_fail (self != NULL); + g_return_val_if_fail (self != NULL, TRUE); bubble = stack_select_next_to_display (self); if (bubble == NULL) ++++++ notify-osd_0.9.35+16.04.20151118.orig.tar.gz -> notify-osd_0.9.35+16.04.20151201.orig.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notify-osd-0.9.35+16.04.20151118/src/bubble.c new/notify-osd-0.9.35+16.04.20151201/src/bubble.c --- old/notify-osd-0.9.35+16.04.20151118/src/bubble.c 2015-11-18 17:39:00.000000000 +0100 +++ new/notify-osd-0.9.35+16.04.20151201/src/bubble.c 2015-12-01 09:28:50.000000000 +0100 @@ -2387,7 +2387,7 @@ filename = g_filename_from_uri (name, NULL, &error); if (filename == NULL) { - g_printerr ("%s is not a valid file uri: %s", name, error->message); + g_warning ("%s is not a valid file uri: %s", name, error->message); g_error_free (error); return; } @@ -2396,6 +2396,14 @@ g_free (filename); } + /* According to the spec, only file:// uris are allowed in the + * name field. However, many applications send raw paths. + * Support those as well, but only if they're absolute. + */ + else if (name[0] == '/') + { + priv->icon_pixbuf = gdk_pixbuf_new_from_file_at_scale (name, scale * icon_size, scale * icon_size, TRUE, NULL); + } else { GError *error = NULL; @@ -2418,7 +2426,7 @@ if (buffer == NULL) { - g_print ("Unable to load icon '%s': %s", name, error->message); + g_warning ("Unable to load icon '%s': %s", name, error->message); g_error_free (error); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/notify-osd-0.9.35+16.04.20151118/tests/Makefile.am new/notify-osd-0.9.35+16.04.20151201/tests/Makefile.am --- old/notify-osd-0.9.35+16.04.20151118/tests/Makefile.am 2015-11-18 17:38:55.000000000 +0100 +++ new/notify-osd-0.9.35+16.04.20151201/tests/Makefile.am 2015-12-01 09:28:50.000000000 +0100 @@ -61,7 +61,7 @@ $(WNCK_CFLAGS) \ $(DBUS_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ - -DSRCDIR=\""$(top_srcdir)"\" \ + -DSRCDIR=\""$(abs_top_srcdir)"\" \ -I$(top_srcdir)/src \ -I$(top_srcdir)/
