Hello community,
here is the log from the commit of package mate-screensaver for
openSUSE:Factory checked in at 2019-05-16 22:04:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-screensaver (Old)
and /work/SRC/openSUSE:Factory/.mate-screensaver.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-screensaver"
Thu May 16 22:04:30 2019 rev:23 rq:682576 version:1.22.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-screensaver/mate-screensaver.changes
2019-01-08 12:28:32.556267969 +0100
+++
/work/SRC/openSUSE:Factory/.mate-screensaver.new.5148/mate-screensaver.changes
2019-05-16 22:04:32.266595009 +0200
@@ -1,0 +2,20 @@
+Tue Mar 5 15:19:33 UTC 2019 - [email protected]
+
+- Update to version 1.22.0:
+ * Bump required version of mate-menus.
+ * Support new mate-menus api.
+ * Fix some GDK deprecations.
+ * Fix a gdk_flush warning.
+ * Avoid deprecated GtkStock.
+ * Make translatable the auth-username-label in
+ lock-dialog-default.ui.
+ * mate-screensaver-command: Support unlocking (--unlock) the
+ screensaver via CLI.
+ * fade: Fix fade computation math.
+ * gs-grab-x11: Replace deprecated gdk_error_trap_push/pop.
+ * gs-visual-gl: Replace deprecated gdk_error_trap_push/pop.
+ * gs-lock-plug: Avoid deprecated gdk_keymap_get_default.
+ * Update translations.
+- Rebase mate-screensaver-gtk-3.20.patch.
+
+-------------------------------------------------------------------
Old:
----
mate-screensaver-1.20.3.tar.xz
New:
----
mate-screensaver-1.22.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.fyeaAg/_old 2019-05-16 22:04:32.850594462 +0200
+++ /var/tmp/diff_new_pack.fyeaAg/_new 2019-05-16 22:04:32.854594459 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mate-screensaver
#
-# 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
@@ -16,14 +16,14 @@
#
-%define _version 1.20
+%define _version 1.22
Name: mate-screensaver
-Version: 1.20.3
+Version: 1.22.0
Release: 0
Summary: MATE Desktop screensaver
License: GPL-2.0-or-later AND LGPL-2.0-or-later
Group: System/GUI/Other
-Url: https://mate-desktop.org/
+URL: https://mate-desktop.org/
Source:
https://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE mate-screensaver-1.7.1-vendor_pam_integration.patch
[email protected] -- PAM integration with SUSE.
Patch0: mate-screensaver-1.7.1-vendor_pam_integration.patch
++++++ mate-screensaver-1.20.3.tar.xz -> mate-screensaver-1.22.0.tar.xz ++++++
++++ 28624 lines of diff (skipped)
++++++ mate-screensaver-gtk-3.20.patch ++++++
--- /var/tmp/diff_new_pack.fyeaAg/_old 2019-05-16 22:04:33.550593807 +0200
+++ /var/tmp/diff_new_pack.fyeaAg/_new 2019-05-16 22:04:33.550593807 +0200
@@ -9,7 +9,7 @@
+GLIB_REQUIRED_VERSION=2.48.0
+GTK_REQUIRED_VERSION=3.20.0
X11_REQUIRED_VERSION=1.0
- LIBMATE_MENU_REQUIRED_VERSION=1.10.0
+ LIBMATE_MENU_REQUIRED_VERSION=1.21.0
MATE_DESKTOP_REQUIRED_VERSION=1.17.0
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -63,9 +63,9 @@
+ monitor = gdk_screen_get_monitor_at_point (screen, x, y);
+#endif
- gdk_flush ();
+ gdk_display_flush (display);
grabbed = FALSE;
-@@ -1524,14 +1544,26 @@ connect_window_signals (GSManager *manag
+@@ -1524,17 +1544,31 @@ connect_window_signals (GSManager *manag
static void
gs_manager_create_window_for_monitor (GSManager *manager,
@@ -77,13 +77,9 @@
+#endif
{
GSWindow *window;
-+#if GTK_CHECK_VERSION (3, 22, 0)
- GdkDisplay *display;
-+#endif
GdkRectangle rect;
+#if GTK_CHECK_VERSION (3, 22, 0)
- display = gdk_monitor_get_display (monitor);
gdk_monitor_get_geometry (monitor, &rect);
+#else
+ gdk_screen_get_monitor_geometry (gdk_display_get_default_screen
(display),
@@ -92,7 +88,16 @@
gs_debug ("Creating a window [%d,%d] (%dx%d)",
rect.x, rect.y, rect.width, rect.height);
-@@ -1556,6 +1588,7 @@ gs_manager_create_window_for_monitor (GS
+
++#if GTK_CHECK_VERSION (3, 22, 0)
+ window = gs_window_new (monitor, manager->priv->lock_active);
++#else
++ window = gs_window_new (display, monitor, manager->priv->lock_active);
++#endif
+
+ gs_window_set_user_switch_enabled (window,
manager->priv->user_switch_enabled);
+ gs_window_set_logout_enabled (window, manager->priv->logout_enabled);
+@@ -1554,6 +1588,7 @@ gs_manager_create_window_for_monitor (GS
}
}
@@ -100,7 +105,7 @@
static void
on_display_monitor_added (GdkDisplay *display,
GdkMonitor *monitor,
-@@ -1625,6 +1658,85 @@ on_display_monitor_removed (GdkDisplay *
+@@ -1623,6 +1658,85 @@ on_display_monitor_removed (GdkDisplay *
gdk_display_flush (display);
gdk_x11_ungrab_server ();
}
@@ -186,7 +191,7 @@
static void
gs_manager_destroy_windows (GSManager *manager)
-@@ -1642,12 +1754,18 @@ gs_manager_destroy_windows (GSManager *m
+@@ -1640,12 +1754,18 @@ gs_manager_destroy_windows (GSManager *m
display = gdk_display_get_default ();
@@ -205,7 +210,7 @@
for (l = manager->priv->windows; l; l = l->next)
{
-@@ -1703,6 +1821,9 @@ static void
+@@ -1701,6 +1821,9 @@ static void
gs_manager_create_windows_for_display (GSManager *manager,
GdkDisplay *display)
{
@@ -215,7 +220,7 @@
int n_monitors;
int i;
-@@ -1713,15 +1834,25 @@ gs_manager_create_windows_for_display (G
+@@ -1711,15 +1834,25 @@ gs_manager_create_windows_for_display (G
g_object_ref (manager);
g_object_ref (display);
@@ -241,7 +246,7 @@
}
g_object_unref (display);
-@@ -1739,12 +1870,19 @@ gs_manager_create_windows (GSManager *ma
+@@ -1737,12 +1870,19 @@ gs_manager_create_windows (GSManager *ma
g_assert (manager->priv->windows == NULL);
display = gdk_display_get_default ();
@@ -272,18 +277,19 @@
GdkMonitor * gs_window_get_monitor (GSWindow *window);
+#else
+ gint monitor);
-+int gs_window_get_monitor (GSWindow *window);
++gint gs_window_get_monitor (GSWindow *window);
+#endif
void gs_window_set_background_surface (GSWindow *window,
cairo_surface_t *surface);
-@@ -92,7 +97,11 @@ void gs_window_request_unlock
+@@ -91,7 +96,12 @@ void gs_window_show_message
+ void gs_window_request_unlock (GSWindow *window);
void gs_window_cancel_unlock_request (GSWindow *window);
- GSWindow * gs_window_new (GdkDisplay *display,
+#if GTK_CHECK_VERSION (3, 22, 0)
- GdkMonitor *monitor,
+ GSWindow * gs_window_new (GdkMonitor *monitor,
+#else
++GSWindow * gs_window_new (GdkDisplay *display,
+ gint monitor,
+#endif
gboolean lock_enabled);
@@ -303,7 +309,7 @@
GdkRectangle geometry;
guint obscured : 1;
-@@ -292,35 +296,56 @@ static cairo_region_t *
+@@ -297,35 +301,56 @@ static cairo_region_t *
get_outside_region (GSWindow *window)
{
GdkDisplay *display;
@@ -312,7 +318,7 @@
int num_monitors;
+#else
+ GdkScreen *screen;
-+ gint mon;
++ gint mon;
+#endif
cairo_region_t *region;
@@ -327,7 +333,7 @@
num_monitors = gdk_display_get_n_monitors (display);
for (i = 0; i < num_monitors; i++)
+#else
-+ for (mon = 0; mon < window->priv->monitor; ++mon)
++ for (mon = 0; mon < window->priv->monitor; mon++)
+#endif
{
+#if GTK_CHECK_VERSION (3, 22, 0)
@@ -360,7 +366,7 @@
}
return region;
-@@ -335,7 +360,13 @@ update_geometry (GSWindow *window)
+@@ -340,7 +365,13 @@ update_geometry (GSWindow *window)
outside_region = get_outside_region (window);
@@ -374,7 +380,70 @@
gs_debug ("got geometry for monitor: x=%d y=%d w=%d h=%d",
geometry.x,
geometry.y,
-@@ -1910,7 +1941,11 @@ gs_window_set_status_message (GSWindow
+@@ -366,11 +397,18 @@ update_geometry (GSWindow *window)
+ }
+
+ static void
++#if GTK_CHECK_VERSION (3, 22, 0)
+ monitor_geometry_notify (GdkMonitor *monitor,
+ GParamSpec *pspec,
+ GSWindow *window)
+ {
+ gs_debug ("Got monitor geometry notify signal");
++#else
++screen_size_changed (GdkScreen *screen,
++ GSWindow *window)
++{
++ gs_debug ("Got screen size changed signal");
++#endif
+ gtk_widget_queue_resize (GTK_WIDGET (window));
+ }
+
+@@ -419,10 +457,15 @@ gs_window_move_resize_window (GSWindow *
+ static void
+ gs_window_real_unrealize (GtkWidget *widget)
+ {
++#if GTK_CHECK_VERSION (3, 22, 0)
+ GdkMonitor *monitor = GS_WINDOW (widget)->priv->monitor;
+
+ g_signal_handlers_disconnect_by_func (monitor, monitor_geometry_notify,
+ widget);
++#else
++ g_signal_handlers_disconnect_by_func (gtk_window_get_screen (GTK_WINDOW
(widget)),
++ screen_size_changed, widget);
++#endif
+
+ if (GTK_WIDGET_CLASS (gs_window_parent_class)->unrealize)
+ {
+@@ -577,7 +620,9 @@ widget_set_best_visual (GtkWidget *widge
+ static void
+ gs_window_real_realize (GtkWidget *widget)
+ {
++#if GTK_CHECK_VERSION (3, 22, 0)
+ GdkMonitor *monitor = GS_WINDOW (widget)->priv->monitor;
++#endif
+
+ widget_set_best_visual (widget);
+
+@@ -590,10 +635,17 @@ gs_window_real_realize (GtkWidget *widge
+
+ gs_window_move_resize_window (GS_WINDOW (widget), TRUE, TRUE);
+
++#if GTK_CHECK_VERSION (3, 22, 0)
+ g_signal_connect (monitor,
+ "notify::geometry",
+ G_CALLBACK (monitor_geometry_notify),
+ widget);
++#else
++ g_signal_connect (gtk_window_get_screen (GTK_WINDOW (widget)),
++ "size_changed",
++ G_CALLBACK (screen_size_changed),
++ widget);
++#endif
+ }
+
+ /* every so often we should raise the window in case
+@@ -1925,7 +1977,11 @@ gs_window_set_status_message (GSWindow
void
gs_window_set_monitor (GSWindow *window,
@@ -386,14 +455,14 @@
{
g_return_if_fail (GS_IS_WINDOW (window));
-@@ -1926,10 +1961,18 @@ gs_window_set_monitor (GSWindow *windo
+@@ -1941,10 +1997,18 @@ gs_window_set_monitor (GSWindow *windo
g_object_notify (G_OBJECT (window), "monitor");
}
+#if GTK_CHECK_VERSION (3, 22, 0)
GdkMonitor *
+#else
-+int
++gint
+#endif
gs_window_get_monitor (GSWindow *window)
{
@@ -405,7 +474,7 @@
return window->priv->monitor;
}
-@@ -1968,7 +2011,11 @@ gs_window_set_property (GObject
+@@ -1983,7 +2047,11 @@ gs_window_set_property (GObject
gs_window_set_logout_timeout (self, g_value_get_long (value));
break;
case PROP_MONITOR:
@@ -417,7 +486,7 @@
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-@@ -2010,7 +2057,11 @@ gs_window_get_property (GObject *obje
+@@ -2025,7 +2093,11 @@ gs_window_get_property (GObject *obje
g_value_set_long (value, self->priv->logout_timeout);
break;
case PROP_MONITOR:
@@ -429,7 +498,7 @@
break;
case PROP_OBSCURED:
g_value_set_boolean (value, self->priv->obscured);
-@@ -2411,10 +2462,19 @@ gs_window_class_init (GSWindowClass *kla
+@@ -2426,10 +2498,19 @@ gs_window_class_init (GSWindowClass *kla
g_object_class_install_property (object_class,
PROP_MONITOR,
@@ -449,18 +518,25 @@
}
static void
-@@ -2547,7 +2607,11 @@ gs_window_finalize (GObject *object)
+@@ -2561,11 +2642,18 @@ gs_window_finalize (GObject *object)
+ }
GSWindow *
- gs_window_new (GdkDisplay *display,
+#if GTK_CHECK_VERSION (3, 22, 0)
- GdkMonitor *monitor,
+ gs_window_new (GdkMonitor *monitor,
+#else
++gs_window_new (GdkDisplay *display,
+ gint monitor,
+#endif
gboolean lock_enabled)
{
- GObject *result;
+ GObject *result;
++#if GTK_CHECK_VERSION (3, 22, 0)
+ GdkDisplay *display = gdk_monitor_get_display (monitor);
++#endif
+ GdkScreen *screen = gdk_display_get_default_screen (display);
+
+ result = g_object_new (GS_TYPE_WINDOW,
--- a/src/mate-screensaver-preferences.c
+++ b/src/mate-screensaver-preferences.c
@@ -387,10 +387,17 @@ help_display (void)
@@ -483,7 +559,7 @@
{
--- a/src/test-window.c
+++ b/src/test-window.c
-@@ -123,12 +123,22 @@ test_window (void)
+@@ -123,14 +123,26 @@ test_window (void)
gboolean lock_active;
gboolean user_switch_enabled;
GdkDisplay *display;
@@ -491,7 +567,7 @@
GdkMonitor *monitor;
+#else
+ GdkScreen *screen;
-+ gint monitor;
++ int monitor;
+#endif
lock_active = TRUE;
@@ -499,10 +575,14 @@
display = gdk_display_get_default ();
+#if GTK_CHECK_VERSION (3, 22, 0)
monitor = gdk_display_get_primary_monitor (display);
+
+ window = gs_window_new (monitor, lock_active);
+#else
+ screen = gdk_display_get_default_screen (display);
+ monitor = gdk_screen_get_primary_monitor (screen);
++
++ window = gs_window_new (display, monitor, lock_active);
+#endif
- window = gs_window_new (display, monitor, lock_active);
+ gs_window_set_user_switch_enabled (window, user_switch_enabled);
