Hello community,
here is the log from the commit of package mate-notification-daemon for
openSUSE:Factory checked in at 2019-05-16 22:04:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-notification-daemon (Old)
and /work/SRC/openSUSE:Factory/.mate-notification-daemon.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-notification-daemon"
Thu May 16 22:04:15 2019 rev:20 rq:682571 version:1.22.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/mate-notification-daemon/mate-notification-daemon.changes
2018-06-19 12:03:51.409601315 +0200
+++
/work/SRC/openSUSE:Factory/.mate-notification-daemon.new.5148/mate-notification-daemon.changes
2019-05-16 22:04:16.338609930 +0200
@@ -1,0 +2,14 @@
+Tue Mar 5 15:19:33 UTC 2019 - [email protected]
+
+- Update to version 1.22.0:
+ * Migrate from dbus-glib to GDBus.
+ * Use GVariant.
+ * Add signals, remove annotation from xml file.
+ * Fix some gdk deprecations.
+ * src/daemon/daemon.c: Replace deprecated gvfs-open call by
+ "gio open" from libglib2.0-bin.
+ * Disable deprecation warnings for distcheck.
+ * Avoid compile warning for g_type_class_add_private.
+- Rebase mate-notification-daemon-gtk-3.20.patch.
+
+-------------------------------------------------------------------
Old:
----
mate-notification-daemon-1.20.1.tar.xz
New:
----
mate-notification-daemon-1.22.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-notification-daemon.spec ++++++
--- /var/tmp/diff_new_pack.4XTAK5/_old 2019-05-16 22:04:17.606608742 +0200
+++ /var/tmp/diff_new_pack.4XTAK5/_new 2019-05-16 22:04:17.610608739 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mate-notification-daemon
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,18 +12,18 @@
# 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 1.20
+%define _version 1.22
Name: mate-notification-daemon
-Version: 1.20.1
+Version: 1.22.0
Release: 0
Summary: Notification daemon for MATE
License: GPL-2.0-or-later
Group: System/GUI/Other
-Url: https://mate-desktop.org/
+URL: https://mate-desktop.org/
Source:
http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE mate-notification-daemon-gtk-3.20.patch -- Restore
GLib 2.48 and GTK+ 3.20 support.
Patch0: mate-notification-daemon-gtk-3.20.patch
@@ -31,7 +31,6 @@
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(dbus-1)
-BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-3.0) >= 3.20
BuildRequires: pkgconfig(libcanberra-gtk3)
@@ -78,11 +77,7 @@
%endif
%files
-%if 0%{?suse_version} >= 1500
%license COPYING
-%else
-%doc COPYING
-%endif
%doc AUTHORS NEWS
%{_bindir}/mate-notification-properties
%dir %{_libexecdir}/mate-notification-daemon/
++++++ mate-notification-daemon-1.20.1.tar.xz ->
mate-notification-daemon-1.22.0.tar.xz ++++++
++++ 15935 lines of diff (skipped)
++++++ mate-notification-daemon-gtk-3.20.patch ++++++
--- /var/tmp/diff_new_pack.4XTAK5/_old 2019-05-16 22:04:17.822608540 +0200
+++ /var/tmp/diff_new_pack.4XTAK5/_new 2019-05-16 22:04:17.822608540 +0200
@@ -15,9 +15,9 @@
dnl
---------------------------------------------------------------------------
-REQ_GLIB_VERSION=2.50.0
+REQ_GLIB_VERSION=2.48.0
- REQ_DBUS_VERSION=0.78
REQ_LIBCANBERRA_GTK_VERSION=0.4
PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
+ pkg_modules="
--- a/src/capplet/mate-notification-properties.c
+++ b/src/capplet/mate-notification-properties.c
@@ -212,8 +212,12 @@ static void notification_properties_dial
@@ -26,7 +26,7 @@
g_assert(screen != NULL);
-
+
-+#if GTK_CHECK_VERSION (3, 22, 0)
++#if GTK_CHECK_VERSION(3, 22, 0)
num_monitors = gdk_display_get_n_monitors(display);
+#else
+ num_monitors = gdk_screen_get_n_monitors(screen);
@@ -36,34 +36,34 @@
store = gtk_list_store_new(N_COLUMNS_MONITOR, G_TYPE_INT);
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
-@@ -176,6 +176,7 @@ static void remove_exit_timeout(NotifyDa
- daemon->priv->exit_timeout_source = 0;
+@@ -272,6 +272,7 @@ static void remove_exit_timeout(NotifyDa
+ daemon->exit_timeout_source = 0;
}
-+#if GTK_CHECK_VERSION(3, 22, 0)
++#if GTK_CHECK_VERSION (3, 22, 0)
static int
_gtk_get_monitor_num (GdkMonitor *monitor)
{
-@@ -194,10 +195,17 @@ _gtk_get_monitor_num (GdkMonitor *monito
+@@ -290,10 +291,17 @@ _gtk_get_monitor_num (GdkMonitor *monito
}
static void create_stack_for_monitor(NotifyDaemon* daemon, GdkScreen* screen,
GdkMonitor *monitor_num)
+#else
-+static void create_stack_for_monitor(NotifyDaemon *daemon, GdkScreen *screen,
int monitor_num)
++static void create_stack_for_monitor(NotifyDaemon* daemon, GdkScreen* screen,
gint monitor_num)
+#endif
{
- NotifyScreen* nscreen = daemon->priv->screen;
+ NotifyScreen* nscreen = daemon->screen;
+#if GTK_CHECK_VERSION(3, 22, 0)
- nscreen->stacks[_gtk_get_monitor_num(monitor_num)] =
notify_stack_new(daemon, screen, monitor_num, daemon->priv->stack_location);
+ nscreen->stacks[_gtk_get_monitor_num(monitor_num)] =
notify_stack_new(daemon, screen, monitor_num, daemon->stack_location);
+#else
-+ nscreen->stacks[monitor_num] = notify_stack_new(daemon, screen,
monitor_num, daemon->priv->stack_location);
++ nscreen->stacks[monitor_num] = notify_stack_new(daemon, screen,
monitor_num, daemon->stack_location);
+#endif
}
static void on_screen_monitors_changed(GdkScreen* screen, NotifyDaemon*
daemon)
-@@ -210,7 +218,11 @@ static void on_screen_monitors_changed(G
- nscreen = daemon->priv->screen;
+@@ -306,7 +314,11 @@ static void on_screen_monitors_changed(G
+ nscreen = daemon->screen;
display = gdk_screen_get_display (screen);
+#if GTK_CHECK_VERSION(3, 22, 0)
@@ -74,7 +74,7 @@
if (n_monitors > nscreen->n_stacks)
{
-@@ -220,7 +232,11 @@ static void on_screen_monitors_changed(G
+@@ -316,7 +328,11 @@ static void on_screen_monitors_changed(G
/* add more stacks */
for (i = nscreen->n_stacks; i < n_monitors; i++)
{
@@ -86,8 +86,8 @@
}
nscreen->n_stacks = n_monitors;
-@@ -266,13 +282,21 @@ static void create_stacks_for_screen(Not
- nscreen = daemon->priv->screen;
+@@ -362,13 +378,21 @@ static void create_stacks_for_screen(Not
+ nscreen = daemon->screen;
display = gdk_screen_get_display (screen);
+#if GTK_CHECK_VERSION(3, 22, 0)
@@ -108,19 +108,30 @@
}
}
-@@ -1508,7 +1532,11 @@ gboolean notify_daemon_notify_handler(No
+@@ -1073,6 +1097,10 @@ static void url_clicked_cb(GtkWindow* nw
+ {
+ cmd = g_strdup_printf ("gio open %s", escaped_url);
+ }
++ else if ((found = g_find_program_in_path ("gvfs-open")) != NULL)
++ {
++ cmd = g_strdup_printf ("gvfs-open %s", escaped_url);
++ }
+ else if ((found = g_find_program_in_path ("xdg-open")) != NULL)
+ {
+ cmd = g_strdup_printf ("xdg-open %s", escaped_url);
+@@ -1500,7 +1528,11 @@ static gboolean notify_daemon_notify_han
}
else
{
+#if GTK_CHECK_VERSION (3, 22, 0)
GdkMonitor *monitor_id;
+#else
-+ int monitor_num;
++ gint monitor_num;
+#endif
GdkDisplay *display;
GdkSeat *seat;
GdkDevice *pointer;
-@@ -1527,15 +1555,24 @@ gboolean notify_daemon_notify_handler(No
+@@ -1519,15 +1551,24 @@ static gboolean notify_daemon_notify_han
pointer = gdk_seat_get_pointer (seat);
gdk_device_get_position (pointer, &screen, &x, &y);
@@ -142,22 +153,22 @@
}
+#if GTK_CHECK_VERSION (3, 22, 0)
- if (_gtk_get_monitor_num (monitor_id) >= priv->screen->n_stacks)
+ if (_gtk_get_monitor_num (monitor_id) >=
daemon->screen->n_stacks)
{
/* screw it - dump it on the last one we'll get
-@@ -1544,6 +1581,16 @@ gboolean notify_daemon_notify_handler(No
+@@ -1536,6 +1577,16 @@ static gboolean notify_daemon_notify_han
}
- notify_stack_add_window
(priv->screen->stacks[_gtk_get_monitor_num (monitor_id)], nw, new_notification);
+ notify_stack_add_window
(daemon->screen->stacks[_gtk_get_monitor_num (monitor_id)], nw,
new_notification);
+#else
-+ if (monitor_num >= priv->screen->n_stacks)
++ if (monitor_num >= daemon->screen->n_stacks)
+ {
+ /* screw it - dump it on the last one we'll get
-+ a monitors-changed signal soon enough*/
-+ monitor_num = priv->screen->n_stacks - 1;
++ a monitors-changed signal soon enough */
++ monitor_num = daemon->screen->n_stacks - 1;
+ }
+
-+ notify_stack_add_window (priv->screen->stacks[monitor_num], nw,
new_notification);
++ notify_stack_add_window (daemon->screen->stacks[monitor_num],
nw, new_notification);
+#endif
}
@@ -171,7 +182,7 @@
+#if GTK_CHECK_VERSION (3, 22, 0)
GdkMonitor *monitor;
+#else
-+ int monitor;
++ gint monitor;
+#endif
NotifyStackLocation location;
GList* windows;
@@ -196,7 +207,7 @@
+#if GTK_CHECK_VERSION (3, 22, 0)
GdkMonitor *monitor,
+#else
-+ int monitor,
++ gint monitor,
+#endif
NotifyStackLocation location)
{
@@ -232,10 +243,10 @@
typedef struct _NotifyStack NotifyStack;
-+#if GTK_CHECK_VERSION (3, 22, 0)
++#if GTK_CHECK_VERSION(3, 22, 0)
NotifyStack* notify_stack_new(NotifyDaemon* daemon, GdkScreen* screen,
GdkMonitor *monitor, NotifyStackLocation stack_location);
+#else
-+NotifyStack *notify_stack_new(NotifyDaemon *daemon, GdkScreen *screen, int
monitor, NotifyStackLocation stack_location);
++NotifyStack *notify_stack_new(NotifyDaemon *daemon, GdkScreen *screen, gint
monitor, NotifyStackLocation stack_location);
+#endif
void notify_stack_destroy(NotifyStack* stack);
@@ -246,22 +257,22 @@
GdkScreen* screen;
GdkRectangle monitor_geometry;
GdkDisplay* display;
-+#if GTK_CHECK_VERSION(3, 22, 0)
++#if GTK_CHECK_VERSION (3, 22, 0)
GdkMonitor* monitor;
+#else
-+ int monitor;
++ gint monitor;
+#endif
windata = g_object_get_data(G_OBJECT(nw), "windata");
screen = gdk_window_get_screen(GDK_WINDOW( gtk_widget_get_window(nw)));
display = gdk_screen_get_display (screen);
-+#if GTK_CHECK_VERSION(3, 22, 0)
++#if GTK_CHECK_VERSION (3, 22, 0)
monitor = gdk_display_get_monitor_at_point (display, windata->point_x,
windata->point_y);
gdk_monitor_get_geometry (monitor, &monitor_geometry);
+#else
-+ monitor = gdk_screen_get_monitor_at_point(screen, windata->point_x,
windata->point_y);
-+ gdk_screen_get_monitor_geometry(screen, monitor, &monitor_geometry);
++ monitor = gdk_screen_get_monitor_at_point (screen, windata->point_x,
windata->point_y);
++ gdk_screen_get_monitor_geometry (screen, monitor, &monitor_geometry);
+#endif
if (windata->point_y - monitor_geometry.y + windata->height +
DEFAULT_ARROW_HEIGHT > monitor_geometry.height)
@@ -270,10 +281,10 @@
int arrow_offset = DEFAULT_ARROW_OFFSET;
GdkPoint* shape_points = NULL;
int i = 0;
-+#if GTK_CHECK_VERSION(3, 22, 0)
++#if GTK_CHECK_VERSION (3, 22, 0)
GdkMonitor* monitor;
+#else
-+ int monitor;
++ gint monitor;
+#endif
GdkDisplay* display;
GdkRectangle monitor_geometry;
@@ -282,12 +293,12 @@
screen = gdk_window_get_screen(GDK_WINDOW(gtk_widget_get_window(nw)));
display = gdk_screen_get_display (screen);
-+#if GTK_CHECK_VERSION(3, 22, 0)
++#if GTK_CHECK_VERSION (3, 22, 0)
monitor = gdk_display_get_monitor_at_point (display, windata->point_x,
windata->point_y);
gdk_monitor_get_geometry (monitor, &monitor_geometry);
+#else
-+ monitor = gdk_screen_get_monitor_at_point(screen, windata->point_x,
windata->point_y);
-+ gdk_screen_get_monitor_geometry(screen, monitor, &monitor_geometry);
++ monitor = gdk_screen_get_monitor_at_point (screen, windata->point_x,
windata->point_y);
++ gdk_screen_get_monitor_geometry (screen, monitor, &monitor_geometry);
+#endif
windata->num_border_points = 5;
