Hello community,
here is the log from the commit of package mate-settings-daemon for
openSUSE:Factory checked in at 2018-03-20 21:57:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.mate-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-settings-daemon"
Tue Mar 20 21:57:40 2018 rev:21 rq:586587 version:1.20.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/mate-settings-daemon/mate-settings-daemon.changes
2017-11-09 13:57:13.372371365 +0100
+++
/work/SRC/openSUSE:Factory/.mate-settings-daemon.new/mate-settings-daemon.changes
2018-03-20 21:58:08.990456709 +0100
@@ -1,0 +2,33 @@
+Fri Mar 9 19:10:07 UTC 2018 - [email protected]
+
+- Update to version 1.20.0:
+ * Require GTK+ 3.22 and GLib 2.50.
+ * Add GlobalMenu support.
+ * HiDPI: Load xsettings during initialisation phase.
+ * Add HiDPI configuration in XSettings.
+ * Add support for HiDPI displays.
+ * Bump the required version of mate-desktop.
+ * Avoid deprecated gdk_screen_get_monitor_,
+ gdk_screen_get_width/height(), gdk_screen_get_number(),
+ gdk_screen_get_width/height_mm(), gdk_display_get_screen(),
+ gdk_display_get_n_screens() functions.
+ * msd-a11y-preferences-dialog.ui: Clean up deprecations.
+ * ally-keyboard: Fix help link.
+ * Don't use deprecated gtk_show_uri().
+ * Fix XRandr applet dying on restart.
+ * msd-xrandr-manager: Avoid deprecated gtk_misc_set_padding().
+ * ldsm-dialog: Don't use deprecated GtkStock.
+ * datetime: Fix a -Wunused-but-set-variable warning.
+ * touchpad: Disable clickfinger by default.
+ * An implementation of WidthOfScreen and HeightOfScreen.
+ * msd-keyboard-xkb: Fix Gdk-CRITICAL warning on creating the
+ status bar icon.
+ * plugins: G_GNUC_UNUSED in unused but needed variables.
+ * xsettings: Drop CanChangeAccels which won't work with GTK+3.
+ * msd-datetime-mechanism.c: Fix build warnings.
+ * msd-mpris-manager.c: Fix a build warning.
+ * Update translations.
+- Add mate-settings-daemon-gtk-3.20.patch: Restore GLib 2.48 and
+ GTK+ 3.20 support.
+
+-------------------------------------------------------------------
Old:
----
mate-settings-daemon-1.18.2.tar.xz
New:
----
mate-settings-daemon-1.20.0.tar.xz
mate-settings-daemon-gtk-3.20.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.MOF3wr/_old 2018-03-20 21:58:10.390406303 +0100
+++ /var/tmp/diff_new_pack.MOF3wr/_new 2018-03-20 21:58:10.394406159 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mate-settings-daemon
#
-# 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,21 +16,24 @@
#
-%define _version 1.18
+%define _version 1.20
Name: mate-settings-daemon
-Version: 1.18.2
+Version: 1.20.0
Release: 0
Summary: MATE session settings daemon
-License: GPL-2.0 AND LGPL-2.1
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: System/GUI/Other
Url: https://mate-desktop.org/
Source:
http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
+# PATCH-FEATURE-OPENSUSE mate-settings-daemon-gtk-3.20.patch -- Restore GLib
2.48 and GTK+ 3.20 support.
+Patch0: mate-settings-daemon-gtk-3.20.patch
BuildRequires: hicolor-icon-theme
BuildRequires: mate-common >= %{_version}
BuildRequires: pkgconfig
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(dconf) >= 0.13
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.14
+BuildRequires: pkgconfig(glib-2.0) >= 2.48
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.20
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libmatekbd) >= %{_version}
@@ -70,6 +73,7 @@
%prep
%setup -q
+%patch0 -p1
%build
NOCONFIGURE=1 mate-autogen
@@ -86,7 +90,7 @@
%find_lang %{name} %{?no_lang_C}
find %{buildroot} -type f -name "*.la" -delete -print
-%if 0%{?suse_version} <= 1320
+%if 0%{?suse_version} < 1500
%post
%icon_theme_cache_post
%icon_theme_cache_post mate
@@ -99,7 +103,12 @@
%endif
%files
-%doc AUTHORS COPYING COPYING.LIB NEWS
+%if 0%{?suse_version} >= 1500
+%license COPYING COPYING.LIB
+%else
+%doc COPYING COPYING.LIB
+%endif
+%doc AUTHORS NEWS
%config
%{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
%dir %{_sysconfdir}/%{name}/
%dir %{_sysconfdir}/%{name}/xrandr/
++++++ mate-settings-daemon-1.18.2.tar.xz -> mate-settings-daemon-1.20.0.tar.xz
++++++
++++ 58831 lines of diff (skipped)
++++++ mate-settings-daemon-gtk-3.20.patch ++++++
--- a/configure.ac
+++ b/configure.ac
@@ -51,9 +51,9 @@ dnl - Dependencies
dnl ---------------------------------------------------------------------------
DBUS_GLIB_REQUIRED_VERSION=0.74
-GLIB_REQUIRED_VERSION=2.50.0
-GIO_REQUIRED_VERSION=2.50.0
-GTK_REQUIRED_VERSION=3.22.0
+GLIB_REQUIRED_VERSION=2.48.0
+GIO_REQUIRED_VERSION=2.48.0
+GTK_REQUIRED_VERSION=3.20.0
MATE_DESKTOP_REQUIRED_VERSION=1.20.0
LIBMATEKBD_REQUIRED_VERSION=1.17.0
LIBNOTIFY_REQUIRED_VERSION=0.7.0
--- a/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c
+++ b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c
@@ -424,7 +424,11 @@ ax_response_callback (MsdA11yKeyboardMan
case GTK_RESPONSE_HELP:
err = NULL;
+#if GTK_CHECK_VERSION (3, 22, 0)
if (!gtk_show_uri_on_window (parent,
+#else
+ if (!gtk_show_uri (gtk_window_get_screen (parent),
+#endif
"help:mate-user-guide/goscustaccess-6",
gtk_get_current_event_time(),
&err)) {
--- a/plugins/media-keys/msd-media-keys-manager.c
+++ b/plugins/media-keys/msd-media-keys-manager.c
@@ -401,7 +401,11 @@ dialog_show (MsdMediaKeysManager *manage
GtkRequisition win_req;
GdkScreen *pointer_screen;
GdkRectangle geometry;
+#if GTK_CHECK_VERSION (3, 22, 0)
GdkMonitor *monitor;
+#else
+ int monitor;
+#endif
gtk_window_set_screen (GTK_WINDOW (manager->priv->dialog),
manager->priv->current_screen);
@@ -439,12 +443,28 @@ dialog_show (MsdMediaKeysManager *manage
/* The pointer isn't on the current screen, so just
* assume the default monitor
*/
+#if GTK_CHECK_VERSION (3, 22, 0)
monitor = gdk_display_get_monitor (display, 0);
+#else
+ monitor = 0;
+#endif
} else {
+#if GTK_CHECK_VERSION (3, 22, 0)
monitor = gdk_display_get_monitor_at_point (display,
pointer_x, pointer_y);
+#else
+ monitor = gdk_screen_get_monitor_at_point
(gdk_display_get_default_screen (display),
+ pointer_x,
+ pointer_y);
+#endif
}
+#if GTK_CHECK_VERSION (3, 22, 0)
gdk_monitor_get_geometry (monitor, &geometry);
+#else
+ gdk_screen_get_monitor_geometry (gdk_display_get_default_screen
(display),
+ monitor,
+ &geometry);
+#endif
screen_w = geometry.width;
screen_h = geometry.height;
--- a/plugins/xsettings/msd-xsettings-manager.c
+++ b/plugins/xsettings/msd-xsettings-manager.c
@@ -231,21 +231,38 @@ static int
get_window_scale_auto ()
{
GdkDisplay *display;
+#if GTK_CHECK_VERSION (3, 22, 0)
GdkMonitor *monitor;
+#else
+ GdkScreen *screen;
+ int monitor;
+#endif
GdkRectangle rect;
int width_mm, height_mm;
int monitor_scale, window_scale;
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
/* Use current value as the default */
window_scale = 1;
+#if GTK_CHECK_VERSION (3, 22, 0)
gdk_monitor_get_geometry (monitor, &rect);
width_mm = gdk_monitor_get_width_mm (monitor);
height_mm = gdk_monitor_get_height_mm (monitor);
monitor_scale = gdk_monitor_get_scale_factor (monitor);
+#else
+ gdk_screen_get_monitor_geometry (screen, monitor, &rect);
+ width_mm = gdk_screen_get_monitor_width_mm (screen, monitor);
+ height_mm = gdk_screen_get_monitor_height_mm (screen, monitor);
+ monitor_scale = gdk_screen_get_monitor_scale_factor (screen, monitor);
+#endif
if (rect.height * monitor_scale < HIDPI_MIN_HEIGHT)
return 1;
