Hello community, here is the log from the commit of package notify-osd for openSUSE:Factory checked in at 2016-05-10 09:27:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-01-01 19:51:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.notify-osd.new/notify-osd.changes 2016-05-10 09:27:21.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 4 16:34:01 UTC 2016 - sor.ale...@meowr.ru + +- Update to version 0.9.35~bzr20160415: + * Stack: Allow to replace a notification when the replace_id has + been provided (lp#1569682). +- Update notify-osd-leolik.patch. + +------------------------------------------------------------------- Old: ---- notify-osd_0.9.35+16.04.20151201.orig.tar.gz New: ---- notify-osd_0.9.35+16.04.20160415.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notify-osd.spec ++++++ --- /var/tmp/diff_new_pack.WvmEYi/_old 2016-05-10 09:27:22.000000000 +0200 +++ /var/tmp/diff_new_pack.WvmEYi/_new 2016-05-10 09:27:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package notify-osd # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,9 +16,9 @@ # -%define _version 0.9.35+16.04.20151201 +%define _version 0.9.35+16.04.20160415 Name: notify-osd -Version: 0.9.35~bzr20151201 +Version: 0.9.35~bzr20160415 Release: 0 Summary: Streamlined Notification Daemon License: GPL-3.0+ @@ -34,6 +34,7 @@ BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: intltool +BuildRequires: pkg-config BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) @@ -53,7 +54,7 @@ and timeouts. %prep -%setup -q -n %{name}-%{_version} +%setup -q -c %patch0 %patch1 -p1 ++++++ notify-osd-leolik.patch ++++++ --- /var/tmp/diff_new_pack.WvmEYi/_old 2016-05-10 09:27:22.000000000 +0200 +++ /var/tmp/diff_new_pack.WvmEYi/_new 2016-05-10 09:27:22.000000000 +0200 @@ -199,7 +199,7 @@ // "clear" input-mask, set title/icon/attributes gtk_widget_set_app_paintable (window, TRUE); gtk_window_set_title (GTK_WINDOW (window), "notify-osd"); -@@ -2681,7 +2741,7 @@ +@@ -2690,7 +2750,7 @@ priv = self->priv; @@ -208,7 +208,7 @@ return FALSE; return priv->mouse_over; -@@ -2785,7 +2845,7 @@ +@@ -2794,7 +2854,7 @@ // check if mouse-pointer is over bubble (and proximity-area) initially pointer_update (self); @@ -217,7 +217,7 @@ priv->prevent_fade = TRUE; else priv->prevent_fade = FALSE; -@@ -3348,6 +3408,8 @@ +@@ -3357,6 +3417,8 @@ gint old_bubble_height = 0; gint new_bubble_width = 0; gint new_bubble_height = 0; @@ -226,7 +226,7 @@ Defaults* d; BubblePrivate* priv; -@@ -3542,6 +3604,13 @@ +@@ -3551,6 +3613,13 @@ _refresh_body (self); update_shape (self); @@ -635,7 +635,7 @@ /* fwd declaration */ void close_handler (GObject* n, Stack* stack); -@@ -653,6 +654,15 @@ +@@ -674,6 +675,15 @@ if (body) bubble_set_message_body (bubble, body); @@ -651,20 +651,28 @@ if (new_bubble && bubble_is_append_allowed(bubble)) { app_bubble = find_bubble_for_append(self, bubble); -@@ -964,8 +974,7 @@ +@@ -984,8 +994,54 @@ case SLOT_ALLOCATION_FIXED: *y += EM2PIXELS (defaults_get_icon_size (d), d) + 2 * EM2PIXELS (defaults_get_margin_size (d), d) + - EM2PIXELS (defaults_get_bubble_vert_gap (d), d); /* + - 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d);*/ + EM2PIXELS (defaults_get_bubble_vert_gap (d), d) + 2; - break; - - case SLOT_ALLOCATION_DYNAMIC: -@@ -981,6 +990,161 @@ - - } - break; ++ break; ++ ++ case SLOT_ALLOCATION_DYNAMIC: ++ g_assert (stack_is_slot_vacant (self, SLOT_TOP) == OCCUPIED); ++ *y += bubble_get_height (self->slots[SLOT_TOP]) + ++ EM2PIXELS (defaults_get_bubble_vert_gap (d), d) - ++ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d); ++ break; ++ ++ default: ++ break; ++ } ++ ++ } ++ break; + + case GRAVITY_WEST: + d = self->defaults; @@ -697,21 +705,13 @@ + *y += EM2PIXELS (defaults_get_icon_size (d), d) + + 2 * EM2PIXELS (defaults_get_margin_size (d), d) + + EM2PIXELS (defaults_get_bubble_vert_gap (d), d) + 2; -+ break; -+ -+ case SLOT_ALLOCATION_DYNAMIC: -+ g_assert (stack_is_slot_vacant (self, SLOT_TOP) == OCCUPIED); -+ *y += bubble_get_height (self->slots[SLOT_TOP]) + -+ EM2PIXELS (defaults_get_bubble_vert_gap (d), d) - -+ 2 * EM2PIXELS (defaults_get_bubble_shadow_size (d, is_composited), d); -+ break; -+ -+ default: -+ break; -+ } -+ -+ } -+ break; + break; + + case SLOT_ALLOCATION_DYNAMIC: +@@ -1001,6 +1057,114 @@ + + } + break; + + case GRAVITY_SOUTH_EAST: + d = self->defaults; ++++++ notify-osd_0.9.35+16.04.20151201.orig.tar.gz -> notify-osd_0.9.35+16.04.20160415.orig.tar.gz ++++++ ++++ 86940 lines of diff (skipped)