Hello community,
here is the log from the commit of package mate-power-manager for
openSUSE:Factory checked in at 2018-03-20 21:57:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-power-manager (Old)
and /work/SRC/openSUSE:Factory/.mate-power-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-power-manager"
Tue Mar 20 21:57:27 2018 rev:19 rq:586577 version:1.20.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/mate-power-manager/mate-power-manager.changes
2017-11-03 16:26:49.071913760 +0100
+++
/work/SRC/openSUSE:Factory/.mate-power-manager.new/mate-power-manager.changes
2018-03-20 21:58:00.926747047 +0100
@@ -1,0 +2,18 @@
+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_monitor_,
+ gdk_screen_get_width/height(), gdk_display_get_screen()
+ functions.
+ * Don't use deprecated gtk_show_uri().
+ * Actually check the $XPROTO_REQUIRED variable's value.
+ * An implementation of WidthOfScreen and HeightOfScreen.
+ * Avoid deprecated GtkStock.
+ * inhibit applet: Fix rendering of the icon.
+ * Correct spelling mistakes.
+ * Update translations.
+- Add mate-power-manager-gtk-3.20.patch: Restore GLib 2.48 and
+ GTK+ 3.20 support.
+
+-------------------------------------------------------------------
Old:
----
mate-power-manager-1.18.1.tar.xz
New:
----
mate-power-manager-1.20.0.tar.xz
mate-power-manager-gtk-3.20.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-power-manager.spec ++++++
--- /var/tmp/diff_new_pack.2LCnGr/_old 2018-03-20 21:58:01.686719684 +0100
+++ /var/tmp/diff_new_pack.2LCnGr/_new 2018-03-20 21:58:01.690719541 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mate-power-manager
#
-# 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,25 +16,26 @@
#
-%define _version 1.18
+%define _version 1.20
Name: mate-power-manager
-Version: 1.18.1
+Version: 1.20.0
Release: 0
Summary: MATE Desktop UPower policy management
-License: GPL-2.0
+License: GPL-2.0-only
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-power-manager-gtk-3.20.patch -- Restore GLib
2.48 and GTK+ 3.20 support.
+Patch0: mate-power-manager-gtk-3.20.patch
BuildRequires: fdupes
-BuildRequires: libxml2-python
BuildRequires: mate-common >= %{_version}
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: yelp-tools
BuildRequires: pkgconfig(dbus-glib-1)
-BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(glib-2.0) >= 2.48
BuildRequires: pkgconfig(gnome-keyring-1)
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.14
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.20
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libmatepanelapplet-4.0) >= %{_version}
BuildRequires: pkgconfig(libnotify)
@@ -59,6 +60,7 @@
%prep
%setup -q
+%patch0 -p1
%build
NOCONFIGURE=1 mate-autogen
@@ -71,7 +73,7 @@
%find_lang %{name} %{?no_lang_C}
%fdupes %{buildroot}%{_datadir}/
-%if 0%{?suse_version} <= 1320
+%if 0%{?suse_version} < 1500
%post
%desktop_database_post
%icon_theme_cache_post
@@ -84,7 +86,12 @@
%endif
%files
-%doc AUTHORS COPYING NEWS README
+%if 0%{?suse_version} >= 1500
+%license COPYING
+%else
+%doc COPYING
+%endif
+%doc AUTHORS NEWS README
%{_sysconfdir}/xdg/autostart/mate-power-manager.desktop
%{_bindir}/mate-power-manager
%{_bindir}/mate-power-preferences
++++++ mate-power-manager-1.18.1.tar.xz -> mate-power-manager-1.20.0.tar.xz
++++++
++++ 31646 lines of diff (skipped)
++++++ mate-power-manager-gtk-3.20.patch ++++++
--- a/applets/brightness/gpm-common.c
+++ b/applets/brightness/gpm-common.c
@@ -45,7 +45,11 @@ gpm_help_display (const gchar *link_id)
else
uri = g_strdup ("help:mate-power-manager");
+#if GTK_CHECK_VERSION (3, 22, 0)
gtk_show_uri_on_window (NULL, uri, GDK_CURRENT_TIME, &error);
+#else
+ gtk_show_uri (gdk_screen_get_default (), uri, GDK_CURRENT_TIME, &error);
+#endif
if (error != NULL) {
GtkWidget *d;
--- a/applets/inhibit/gpm-common.c
+++ b/applets/inhibit/gpm-common.c
@@ -45,7 +45,11 @@ gpm_help_display (const gchar *link_id)
else
uri = g_strdup ("help:mate-power-manager");
+#if GTK_CHECK_VERSION (3, 22, 0)
gtk_show_uri_on_window (NULL, uri, GDK_CURRENT_TIME, &error);
+#else
+ gtk_show_uri (gdk_screen_get_default (), uri, GDK_CURRENT_TIME, &error);
+#endif
if (error != NULL) {
GtkWidget *d;
--- a/configure.ac
+++ b/configure.ac
@@ -89,10 +89,10 @@ GLIB_GSETTINGS
dnl
----------------------------------------------------------------------------
dnl - Library dependencies
dnl
----------------------------------------------------------------------------
-GLIB_REQUIRED=2.50.0
-GIO_REQUIRED=2.50.0
-GDK_REQUIRED=3.22.0
-GTK_REQUIRED=3.22.0
+GLIB_REQUIRED=2.48.0
+GIO_REQUIRED=2.48.0
+GDK_REQUIRED=3.20.0
+GTK_REQUIRED=3.20.0
GNOME_KEYRING_REQUIRED=3.0.0
DBUS_REQUIRED=1.0
DBUS_GLIB_REQUIRED=0.70
--- a/src/gpm-backlight.c
+++ b/src/gpm-backlight.c
@@ -208,7 +208,11 @@ gpm_backlight_dialog_show (GpmBacklight
GtkRequisition win_req;
GdkScreen *pointer_screen;
GdkRectangle geometry;
+#if GTK_CHECK_VERSION (3, 22, 0)
GdkMonitor *monitor;
+#else
+ int monitor;
+#endif
GdkDisplay *display;
GdkDeviceManager *device_manager;
GdkDevice *device;
@@ -237,11 +241,21 @@ gpm_backlight_dialog_show (GpmBacklight
&pointer_x,
&pointer_y);
+#if GTK_CHECK_VERSION (3, 22, 0)
monitor = gdk_display_get_monitor_at_point (gdk_screen_get_display
(pointer_screen),
pointer_x,
pointer_y);
gdk_monitor_get_geometry (monitor, &geometry);
+#else
+ monitor = gdk_screen_get_monitor_at_point (pointer_screen,
+ pointer_x,
+ pointer_y);
+
+ gdk_screen_get_monitor_geometry (pointer_screen,
+ monitor,
+ &geometry);
+#endif
screen_w = geometry.width;
screen_h = geometry.height;
--- a/src/gpm-common.c
+++ b/src/gpm-common.c
@@ -145,7 +145,11 @@ gpm_help_display (const gchar *link_id)
else
uri = g_strdup ("help:mate-power-manager");
+#if GTK_CHECK_VERSION (3, 22, 0)
gtk_show_uri_on_window (NULL, uri, GDK_CURRENT_TIME, &error);
+#else
+ gtk_show_uri (gdk_screen_get_default (), uri, GDK_CURRENT_TIME, &error);
+#endif
if (error != NULL) {
GtkWidget *d;
--- a/src/gpm-kbd-backlight.c
+++ b/src/gpm-kbd-backlight.c
@@ -185,7 +185,11 @@ gpm_kbd_backlight_dialog_show (GpmKbdBac
GtkRequisition win_req;
GdkScreen *pointer_screen;
GdkRectangle geometry;
+#if GTK_CHECK_VERSION (3, 22, 0)
GdkMonitor *monitor;
+#else
+ int monitor;
+#endif
GdkDisplay *display;
GdkDeviceManager *device_manager;
GdkDevice *device;
@@ -214,11 +218,21 @@ gpm_kbd_backlight_dialog_show (GpmKbdBac
&pointer_x,
&pointer_y);
+#if GTK_CHECK_VERSION (3, 22, 0)
monitor = gdk_display_get_monitor_at_point (gdk_screen_get_display
(pointer_screen),
pointer_x,
pointer_y);
gdk_monitor_get_geometry (monitor, &geometry);
+#else
+ monitor = gdk_screen_get_monitor_at_point (pointer_screen,
+ pointer_x,
+ pointer_y);
+
+ gdk_screen_get_monitor_geometry (pointer_screen,
+ monitor,
+ &geometry);
+#endif
screen_w = geometry.width;
screen_h = geometry.height;
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -536,7 +536,12 @@ gpm_manager_sleep_failure_response_cb (G
/* user clicked the help button */
if (response_id == GTK_RESPONSE_HELP) {
uri = g_settings_get_string (manager->priv->settings,
GPM_SETTINGS_NOTIFY_SLEEP_FAILED_URI);
+#if GTK_CHECK_VERSION (3, 22, 0)
ret = gtk_show_uri_on_window (GTK_WINDOW (dialog), uri,
gtk_get_current_event_time (), &error);
+#else
+ ret = gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
+ uri, gtk_get_current_event_time (), &error);
+#endif
if (!ret) {
dialog_error = gtk_message_dialog_new (NULL,
GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
"Failed to show
uri %s", error->message);
