Hello community, here is the log from the commit of package mate-screensaver for openSUSE:Factory checked in at 2018-03-20 22:00:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-screensaver (Old) and /work/SRC/openSUSE:Factory/.mate-screensaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-screensaver" Tue Mar 20 22:00:13 2018 rev:19 rq:588613 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-screensaver/mate-screensaver.changes 2017-11-14 12:54:31.860854143 +0100 +++ /work/SRC/openSUSE:Factory/.mate-screensaver.new/mate-screensaver.changes 2018-03-20 22:00:37.457111202 +0100 @@ -1,0 +2,30 @@ +Wed Mar 14 20:18:42 UTC 2018 - [email protected] + +- Remove future aims from description. + +------------------------------------------------------------------- +Wed Mar 14 19:53:44 UTC 2018 - [email protected] + +- Remove buildrequires on xorg-x11-devel, dependencies + were adjusted according to what configure requests and + what libraries are used by the final executable. + +------------------------------------------------------------------- +Fri Mar 9 19:10:07 UTC 2018 - [email protected] + +- Update to version 1.20.0: + * Require GTK+ 3.22 and GLib 2.50. + * Avoid deprecated gdk_screen_get_width/height(). + * Don't use deprecated gtk_show_uri(). + * Implement OpenBSD authentication using bsd_auth(3). + * copy theme dialogue: Fix the build warning about a wrong + variable type. + * An implementation of WidthOfScreen and HeightOfScreen. + * Restore the correct mate-screensaver-command man page. + * Add HiDPI support for the lock screen. + * gs-lock-plug.c: Fix a build warning. + * Update translations. +- Add mate-screensaver-gtk-3.20.patch: Restore GLib 2.48 and + GTK+ 3.20 support. + +------------------------------------------------------------------- Old: ---- mate-screensaver-1.18.2.tar.xz New: ---- mate-screensaver-1.20.0.tar.xz mate-screensaver-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.8cFYLG/_old 2018-03-20 22:00:40.109015723 +0100 +++ /var/tmp/diff_new_pack.8cFYLG/_new 2018-03-20 22:00:40.137014715 +0100 @@ -1,7 +1,7 @@ # # spec file for package mate-screensaver # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,50 +16,52 @@ # -%define _version 1.18 +%define _version 1.20 Name: mate-screensaver -Version: 1.18.2 +Version: 1.20.0 Release: 0 Summary: MATE Desktop screensaver -License: GPL-2.0+ AND LGPL-2.0+ +License: GPL-2.0-or-later AND LGPL-2.0-or-later Group: System/GUI/Other Url: https://mate-desktop.org/ Source: http://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: %{name}-1.7.1-vendor_pam_integration.patch -BuildRequires: libmatekbd-devel +Patch0: mate-screensaver-1.7.1-vendor_pam_integration.patch +# PATCH-FEATURE-OPENSUSE mate-screensaver-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch1: mate-screensaver-gtk-3.20.patch BuildRequires: mate-common >= %{_version} BuildRequires: pam-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel BuildRequires: xscreensaver-data BuildRequires: xscreensaver-data-extra +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 -BuildRequires: pkgconfig(ice) -BuildRequires: pkgconfig(libmate-menu) >= 1.5.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.48 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 +BuildRequires: pkgconfig(libmate-menu) >= %{_version} +BuildRequires: pkgconfig(libmatekbdui) BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libxklavier) BuildRequires: pkgconfig(mate-desktop-2.0) >= %{_version} -BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xscrnsaver) +BuildRequires: pkgconfig(xxf86misc) +BuildRequires: pkgconfig(xxf86vm) Requires: mate-session-manager-gschemas >= %{_version} Recommends: %{name}-lang Recommends: xscreensaver-data Suggests: mate-power-manager >= %{_version} %glib2_gsettings_schema_requires -%if 0%{?suse_version} > 1310 -BuildRequires: pkgconfig(libsystemd) -%else -BuildRequires: pkgconfig(libsystemd-login) -%endif %description -mate-screensaver is a screen saver and locker that aims to have simple, -sane, secure defaults and be well integrated with the desktop. +mate-screensaver is a screen saver and locker that integrates with +the MATE desktop. %package devel Summary: Development files for mate-screensaver @@ -67,14 +69,17 @@ Requires: %{name} = %{version} %description devel -mate-screensaver is a screen saver and locker that aims to have simple, -sane, secure defaults and be well integrated with the desktop. +mate-screensaver is a screen saver and locker that integrates with +the MATE desktop. + +This subpackage contains the pkgconfig file. %lang_package %prep %setup -q %patch0 -p1 +%patch1 -p1 %build NOCONFIGURE=1 mate-autogen @@ -97,7 +102,7 @@ done popd -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %glib2_gsettings_schema_post @@ -108,7 +113,12 @@ %endif %files -%doc README COPYING COPYING.LIB NEWS +%if 0%{?suse_version} >= 1500 +%license COPYING COPYING.LIB +%else +%doc COPYING COPYING.LIB +%endif +%doc README NEWS %dir %{_sysconfdir}/xdg/menus/ %config %{_sysconfdir}/xdg/menus/mate-screensavers.menu %config %{_sysconfdir}/xdg/autostart/mate-screensaver.desktop ++++++ mate-screensaver-1.18.2.tar.xz -> mate-screensaver-1.20.0.tar.xz ++++++ ++++ 21151 lines of diff (skipped) ++++++ mate-screensaver-gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -44,8 +44,8 @@ GLIB_GSETTINGS # Dependencies DBUS_REQUIRED_VERSION=0.30 -GLIB_REQUIRED_VERSION=2.50.0 -GTK_REQUIRED_VERSION=3.22.0 +GLIB_REQUIRED_VERSION=2.48.0 +GTK_REQUIRED_VERSION=3.20.0 X11_REQUIRED_VERSION=1.0 LIBMATE_MENU_REQUIRED_VERSION=1.10.0 MATE_DESKTOP_REQUIRED_VERSION=1.17.0 --- a/src/gs-manager.c +++ b/src/gs-manager.c @@ -1103,7 +1103,12 @@ find_window_at_pointer (GSManager *manag { GdkDisplay *display; GdkDevice *device; +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; +#else + GdkScreen *screen; + int monitor; +#endif int x, y; GSWindow *window; GSList *l; @@ -1111,8 +1116,13 @@ find_window_at_pointer (GSManager *manag display = gdk_display_get_default (); device = gdk_seat_get_pointer (gdk_display_get_default_seat (display)); +#if GTK_CHECK_VERSION (3, 22, 0) gdk_device_get_position (device, NULL, &x, &y); monitor = gdk_display_get_monitor_at_point (display, x, y); +#else + gdk_device_get_position (device, &screen, &x, &y); + monitor = gdk_screen_get_monitor_at_point (screen, x, y); +#endif /* Find the gs-window that is on that monitor */ window = NULL; @@ -1165,14 +1175,24 @@ manager_maybe_grab_window (GSManager *ma { GdkDisplay *display; GdkDevice *device; +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; +#else + GdkScreen *screen; + int monitor; +#endif int x, y; gboolean grabbed; display = gdk_display_get_default (); device = gdk_seat_get_pointer (gdk_display_get_default_seat (display)); +#if GTK_CHECK_VERSION (3, 22, 0) gdk_device_get_position (device, NULL, &x, &y); monitor = gdk_display_get_monitor_at_point (display, x, y); +#else + gdk_device_get_position (device, &screen, &x, &y); + monitor = gdk_screen_get_monitor_at_point (screen, x, y); +#endif gdk_flush (); grabbed = FALSE; @@ -1530,14 +1550,26 @@ connect_window_signals (GSManager *manag static void gs_manager_create_window_for_monitor (GSManager *manager, +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor) +#else + GdkDisplay *display, + int monitor) +#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), + monitor, &rect); +#endif gs_debug ("Creating a window for the monitor [%d,%d] (%dx%d)", monitor, rect.x, rect.y, rect.width, rect.height); @@ -1573,7 +1605,11 @@ on_screen_monitors_changed (GdkScreen *s int i; display = gdk_screen_get_display (screen); +#if GTK_CHECK_VERSION (3, 22, 0) n_monitors = gdk_display_get_n_monitors (display); +#else + n_monitors = gdk_screen_get_n_monitors (screen); +#endif n_windows = g_slist_length (manager->priv->windows); gs_debug ("Monitors changed for display %s: num=%d", @@ -1596,8 +1632,13 @@ on_screen_monitors_changed (GdkScreen *s /* add more windows */ for (i = n_windows; i < n_monitors; i++) { +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *mon = gdk_display_get_monitor (display, i); gs_manager_create_window_for_monitor (manager, mon); +#else + gs_manager_create_window_for_monitor (manager, + display, i); +#endif } /* And put unlock dialog up where ever it's supposed to be @@ -1614,13 +1655,22 @@ on_screen_monitors_changed (GdkScreen *s while (l != NULL) { GdkDisplay *this_display; +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *this_monitor; +#else + int this_monitor; +#endif GSList *next = l->next; this_display = gs_window_get_display (GS_WINDOW (l->data)); this_monitor = gs_window_get_monitor (GS_WINDOW (l->data)); +#if GTK_CHECK_VERSION (3, 22, 0) if (this_display == display && !GDK_IS_MONITOR (this_monitor)) +#else + if (this_display == display && + this_monitor >= n_monitors) +#endif { manager_maybe_stop_job_for_window (manager, GS_WINDOW (l->data)); g_hash_table_remove (manager->priv->jobs, l->data); @@ -1717,6 +1767,9 @@ static void gs_manager_create_windows_for_display (GSManager *manager, GdkDisplay *display) { +#if !GTK_CHECK_VERSION (3, 22, 0) + GdkScreen *screen; +#endif int n_monitors; int i; @@ -1727,15 +1780,25 @@ gs_manager_create_windows_for_display (G g_object_ref (manager); g_object_ref (display); +#if GTK_CHECK_VERSION (3, 22, 0) n_monitors = gdk_display_get_n_monitors (display); +#else + screen = gdk_display_get_default_screen (display); + n_monitors = gdk_screen_get_n_monitors (screen); +#endif gs_debug ("Creating %d windows for display %s", n_monitors, gdk_display_get_name (display)); for (i = 0; i < n_monitors; i++) { +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *mon = gdk_display_get_monitor (display, i); gs_manager_create_window_for_monitor (manager, mon); +#else + gs_manager_create_window_for_monitor (manager, + display, i); +#endif } g_object_unref (display); --- a/src/gs-window.h +++ b/src/gs-window.h @@ -62,8 +62,13 @@ gboolean gs_window_is_dialog_up GdkDisplay * gs_window_get_display (GSWindow *window); void gs_window_set_monitor (GSWindow *window, +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor); GdkMonitor * gs_window_get_monitor (GSWindow *window); +#else + int monitor); +int 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 void gs_window_cancel_unlock_request (GSWindow *window); GSWindow * gs_window_new (GdkDisplay *display, +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor, +#else + int monitor, +#endif gboolean lock_enabled); void gs_window_show (GSWindow *window); void gs_window_destroy (GSWindow *window); --- a/src/gs-window-x11.c +++ b/src/gs-window-x11.c @@ -62,7 +62,11 @@ enum struct GSWindowPrivate { +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; +#else + int monitor; +#endif GdkRectangle geometry; guint obscured : 1; @@ -292,35 +296,56 @@ static cairo_region_t * get_outside_region (GSWindow *window) { GdkDisplay *display; +#if GTK_CHECK_VERSION (3, 22, 0) int i; int num_monitors; +#else + GdkScreen *screen; + int mon; +#endif cairo_region_t *region; display = gtk_widget_get_display (GTK_WIDGET (window)); +#if !GTK_CHECK_VERSION (3, 22, 0) + screen = gdk_display_get_default_screen (display); +#endif region = cairo_region_create (); +#if GTK_CHECK_VERSION (3, 22, 0) num_monitors = gdk_display_get_n_monitors (display); for (i = 0; i < num_monitors; i++) +#else + for (mon = 0; mon < window->priv->monitor; mon++) +#endif { +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *mon = gdk_display_get_monitor (display, i); if (mon != window->priv->monitor) { +#endif GdkRectangle geometry; cairo_rectangle_int_t rectangle; +#if GTK_CHECK_VERSION (3, 22, 0) gdk_monitor_get_geometry (mon, &geometry); +#else + gdk_screen_get_monitor_geometry (screen, mon, + &geometry); +#endif rectangle.x = geometry.x; rectangle.y = geometry.y; rectangle.width = geometry.width; rectangle.height = geometry.height; cairo_region_union_rectangle (region, &rectangle); +#if GTK_CHECK_VERSION (3, 22, 0) } else { break; } +#endif } return region; @@ -335,7 +360,13 @@ update_geometry (GSWindow *window) outside_region = get_outside_region (window); +#if GTK_CHECK_VERSION (3, 22, 0) gdk_monitor_get_geometry (window->priv->monitor, &geometry); +#else + gdk_screen_get_monitor_geometry (gtk_widget_get_screen (GTK_WIDGET (window)), + window->priv->monitor, + &geometry); +#endif gs_debug ("got geometry for monitor: x=%d y=%d w=%d h=%d", geometry.x, geometry.y, @@ -1911,7 +1942,11 @@ gs_window_set_status_message (GSWindow void gs_window_set_monitor (GSWindow *window, +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor) +#else + int monitor) +#endif { g_return_if_fail (GS_IS_WINDOW (window)); @@ -1927,10 +1962,18 @@ gs_window_set_monitor (GSWindow *windo g_object_notify (G_OBJECT (window), "monitor"); } +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor * +#else +int +#endif gs_window_get_monitor (GSWindow *window) { +#if GTK_CHECK_VERSION (3, 22, 0) g_return_val_if_fail (GS_IS_WINDOW (window), NULL); +#else + g_return_val_if_fail (GS_IS_WINDOW (window), -1); +#endif return window->priv->monitor; } @@ -1969,7 +2012,11 @@ gs_window_set_property (GObject gs_window_set_logout_timeout (self, g_value_get_long (value)); break; case PROP_MONITOR: +#if GTK_CHECK_VERSION (3, 22, 0) gs_window_set_monitor (self, g_value_get_pointer (value)); +#else + gs_window_set_monitor (self, g_value_get_int (value)); +#endif break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -2011,7 +2058,11 @@ gs_window_get_property (GObject *obje g_value_set_long (value, self->priv->logout_timeout); break; case PROP_MONITOR: +#if GTK_CHECK_VERSION (3, 22, 0) g_value_set_pointer (value, (gpointer) self->priv->monitor); +#else + g_value_set_int (value, self->priv->monitor); +#endif break; case PROP_OBSCURED: g_value_set_boolean (value, self->priv->obscured); @@ -2412,10 +2463,19 @@ gs_window_class_init (GSWindowClass *kla g_object_class_install_property (object_class, PROP_MONITOR, +#if GTK_CHECK_VERSION (3, 22, 0) g_param_spec_pointer ("monitor", "Gdk monitor", "The monitor (in terms of Gdk) which the window is on", G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); +#else + g_param_spec_int ("monitor", + "RandR monitor", + "The monitor (in terms of RandR) which the window is on", + 0, G_MAXINT, 0, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); +#endif + } static void @@ -2548,7 +2610,11 @@ gs_window_finalize (GObject *object) GSWindow * gs_window_new (GdkDisplay *display, +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor, +#else + int monitor, +#endif gboolean lock_enabled) { GObject *result; --- a/src/mate-screensaver-preferences.c +++ b/src/mate-screensaver-preferences.c @@ -387,10 +387,17 @@ help_display (void) GError *error; error = NULL; +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (NULL, "help:mate-user-guide/prefs-screensaver", GDK_CURRENT_TIME, &error); +#else + gtk_show_uri (NULL, + "help:mate-user-guide/prefs-screensaver", + GDK_CURRENT_TIME, + &error); +#endif if (error != NULL) { --- a/src/test-window.c +++ b/src/test-window.c @@ -123,12 +123,22 @@ test_window (void) gboolean lock_active; gboolean user_switch_enabled; GdkDisplay *display; +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; +#else + GdkScreen *screen; + int monitor; +#endif lock_active = TRUE; user_switch_enabled = TRUE; display = gdk_display_get_default (); +#if GTK_CHECK_VERSION (3, 22, 0) monitor = gdk_display_get_primary_monitor (display); +#else + screen = gdk_display_get_default_screen (display); + monitor = gdk_screen_get_primary_monitor (screen); +#endif window = gs_window_new (display, monitor, lock_active);
