Hello community, here is the log from the commit of package mate-utils for openSUSE:Factory checked in at 2018-03-20 21:58:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-utils (Old) and /work/SRC/openSUSE:Factory/.mate-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-utils" Tue Mar 20 21:58:14 2018 rev:20 rq:586624 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-utils/mate-utils.changes 2017-11-09 13:58:05.234482020 +0100 +++ /work/SRC/openSUSE:Factory/.mate-utils.new/mate-utils.changes 2018-03-20 21:58:45.217152355 +0100 @@ -1,0 +2,23 @@ +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 screenshot support for HiDPI displays. + * Avoid deprecated gdk_screen_get_monitor_, + gdk_screen_width/height(), gdk_screen_get_width/height(), + gdk_screen_get_n_monitors(), gdk_screen_make_display_name(), + gdk_screen_get_number(), gdk_screen_get_active_window() + functions. + * screenshot, dictionary: Avoid deprecated GdkDevice members. + * don't use deprecated gtk_show_uri() + * searchtool & logview: Avoid deprecated GtkAlignment. + * An implementation of WidthOfScreen and HeightOfScreen. + * mate-screenshot: Add a New button + * screenshot-save.c: Fix build warnings with 'pipe', 'write' and + 'read'. + * Add a style class logview-window. + * Update translations. +- Add mate-utils-gtk-3.20.patch: Restore GLib 2.48 and GTK+ 3.20 + support. + +------------------------------------------------------------------- Old: ---- mate-utils-1.18.3.tar.xz New: ---- mate-utils-1.20.0.tar.xz mate-utils-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-utils.spec ++++++ --- /var/tmp/diff_new_pack.lrraqb/_old 2018-03-20 21:58:46.173117935 +0100 +++ /var/tmp/diff_new_pack.lrraqb/_new 2018-03-20 21:58:46.181117647 +0100 @@ -1,7 +1,7 @@ # # spec file for package mate-utils # -# 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 @@ -18,28 +18,29 @@ %define soname_dict libmatedict %define sover_dict 6 -%define _version 1.18 +%define _version 1.20 Name: mate-utils -Version: 1.18.3 +Version: 1.20.0 Release: 0 Summary: MATE Desktop utilities -License: GPL-2.0+ AND LGPL-2.0+ AND GFDL-1.1 +License: GPL-2.0-or-later AND LGPL-2.0-or-later AND GFDL-1.1-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-utils-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch0: mate-utils-gtk-3.20.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: itstool -BuildRequires: libxml2-python BuildRequires: mate-common >= %{_version} BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 +BuildRequires: pkgconfig(gio-2.0) >= 2.48 +BuildRequires: pkgconfig(glib-2.0) >= 2.48 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libgtop-2.0) BuildRequires: pkgconfig(libmatepanelapplet-4.0) >= %{_version} @@ -58,7 +59,7 @@ %package common-lang Summary: Languages for MATE utilities -License: GPL-2.0+ AND LGPL-2.0+ AND GFDL-1.1 +License: GPL-2.0-or-later AND LGPL-2.0-or-later AND GFDL-1.1-only Group: System/Localization Provides: mate-dictionary-lang = %{version} Provides: mate-disk-usage-analyzer-lang = %{version} @@ -71,8 +72,8 @@ Provides common translations shared by Caja extensions %package -n mate-search-tool -Summary: Mate Search Tool -License: GPL-2.0+ +Summary: MATE Search Tool +License: GPL-2.0-or-later Group: System/GUI/Other Requires: mate-desktop-gschemas >= %{_version} Recommends: mate-search-tool-lang @@ -82,8 +83,8 @@ command-line tools such as find and locate to get results. %package -n mate-disk-usage-analyzer -Summary: Mate disk usage analyser -License: GPL-2.0+ +Summary: MATE disk usage analyser +License: GPL-2.0-or-later Group: System/GUI/Other Recommends: mate-disk-usage-analyzer-lang @@ -96,8 +97,8 @@ folder as far as any mounted/unmounted device. %package -n mate-dictionary -Summary: Mate dictionary -License: GPL-2.0+ +Summary: MATE dictionary +License: GPL-2.0-or-later Group: System/GUI/Other Recommends: mate-dictionary-lang @@ -107,8 +108,8 @@ words %package -n mate-system-log -Summary: Mate system log viewer -License: GPL-3.0+ AND GPL-2.0+ +Summary: MATE system log viewer +License: GPL-3.0-or-later AND GPL-2.0-or-later Group: System/GUI/Other Requires: mate-desktop-gschemas >= %{_version} Recommends: mate-system-log-lang @@ -119,8 +120,8 @@ operating system. %package -n mate-screenshot -Summary: Mate screenshot maker -License: GPL-2.0+ +Summary: MATE screenshot maker +License: GPL-2.0-or-later Group: System/GUI/Other Recommends: mate-screenshot-lang @@ -131,7 +132,7 @@ %package -n %{soname_dict}%{sover_dict} Summary: Library to look up words in dictionary sources -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Libraries %description -n %{soname_dict}%{sover_dict} @@ -139,7 +140,7 @@ %package -n %{soname_dict}-devel Summary: Library to look up words in dictionary sources -- Development Files -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: %{soname_dict}%{sover_dict} = %{version} @@ -149,6 +150,7 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen @@ -175,7 +177,7 @@ %postun -n %{soname_dict}%{sover_dict} -p /sbin/ldconfig -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post -n mate-disk-usage-analyzer %desktop_database_post %glib2_gsettings_schema_post @@ -218,7 +220,12 @@ %endif %files -n mate-disk-usage-analyzer -%doc AUTHORS COPYING* NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING* +%else +%doc COPYING* +%endif +%doc AUTHORS NEWS README %{_datadir}/help/C/mate-disk-usage-analyzer/ %{_bindir}/mate-disk-usage-analyzer %{_datadir}/mate-disk-usage-analyzer/ @@ -230,7 +237,12 @@ %{_mandir}/man?/mate-disk-usage-analyzer.?%{?ext_man} %files -n mate-dictionary -%doc AUTHORS COPYING* NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING* +%else +%doc COPYING* +%endif +%doc AUTHORS NEWS README %{_datadir}/help/C/mate-dictionary/ %{_bindir}/mate-dictionary %{_datadir}/dbus-1/services/org.mate.panel.applet.DictionaryAppletFactory.service @@ -247,7 +259,12 @@ %{_mandir}/man?/mate-dictionary.?%{?ext_man} %files -n mate-screenshot -%doc AUTHORS COPYING* NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING* +%else +%doc COPYING* +%endif +%doc AUTHORS NEWS README %{_bindir}/mate-panel-screenshot %{_bindir}/mate-screenshot %{_datadir}/glib-2.0/schemas/org.mate.screenshot.gschema.xml @@ -259,7 +276,12 @@ %{_mandir}/man?/mate-screenshot.?%{?ext_man} %files -n mate-search-tool -%doc AUTHORS COPYING* NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING* +%else +%doc COPYING* +%endif +%doc AUTHORS NEWS README %{_datadir}/help/C/mate-search-tool/ %{_bindir}/mate-search-tool %{_datadir}/glib-2.0/schemas/org.mate.search-tool.gschema.xml @@ -270,7 +292,12 @@ %{_mandir}/man?/mate-search-tool.?%{?ext_man} %files -n mate-system-log -%doc AUTHORS COPYING* NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING* +%else +%doc COPYING* +%endif +%doc AUTHORS NEWS README %{_datadir}/help/C/mate-system-log/ %{_bindir}/mate-system-log %{_datadir}/applications/mate-system-log.desktop @@ -280,7 +307,12 @@ %{_mandir}/man?/mate-system-log.?%{?ext_man} %files -n %{soname_dict}%{sover_dict} -%doc AUTHORS COPYING* NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING* +%else +%doc COPYING* +%endif +%doc AUTHORS NEWS README %{_datadir}/mate-dict/ %{_libdir}/%{soname_dict}.so.%{sover_dict}* ++++++ mate-utils-1.18.3.tar.xz -> mate-utils-1.20.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/mate-utils/mate-utils-1.18.3.tar.xz /work/SRC/openSUSE:Factory/.mate-utils.new/mate-utils-1.20.0.tar.xz differ: char 26, line 1 ++++++ mate-utils-gtk-3.20.patch ++++++ --- a/baobab/src/baobab-utils.c +++ b/baobab/src/baobab-utils.c @@ -506,10 +506,17 @@ baobab_help_display (GtkWindow *parent g_strdup_printf ("help:%s/%s", file_name, link_id) : g_strdup_printf ("help:%s", file_name); +#if GTK_CHECK_VERSION (3, 22, 0) ret = gtk_show_uri_on_window (parent, uri, gtk_get_current_event_time (), &error); +#else + ret = gtk_show_uri (gtk_window_get_screen (parent), + uri, + gtk_get_current_event_time (), + &error); +#endif g_free (uri); if (error != NULL) { --- a/configure.ac +++ b/configure.ac @@ -59,10 +59,10 @@ AC_SUBST(LIBGDICT_LT_VERSION) dnl pkg-config check -GLIB_REQUIRED=2.50.0 -GIO_REQUIRED=2.50.0 +GLIB_REQUIRED=2.48.0 +GIO_REQUIRED=2.48.0 GIO_UNIX_REQUIRED=2.18.0 -GTK_REQUIRED=3.22.0 +GTK_REQUIRED=3.20.0 LIBMATE_PANEL_APPLET_REQUIRED=1.17.0 LIBGTOP_REQUIRED=2.12.0 LIBCANBERRA_GTK_REQUIRED=0.4 --- a/gsearchtool/src/gsearchtool-callbacks.c +++ b/gsearchtool/src/gsearchtool-callbacks.c @@ -186,8 +186,13 @@ click_help_cb (GtkWidget * widget, GtkWidget * window = data; GError * error = NULL; +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (window), "help:mate-search-tool", gtk_get_current_event_time (), &error); +#else + gtk_show_uri (gtk_widget_get_screen (widget), "help:mate-search-tool", + gtk_get_current_event_time (), &error); +#endif if (error) { GtkWidget * dialog; --- a/logview/src/logview-window.c +++ b/logview/src/logview-window.c @@ -356,7 +356,11 @@ logview_help (GtkAction *action, GtkWidg { GError *error = NULL; +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (parent_window), +#else + gtk_show_uri (gtk_widget_get_screen (GTK_WINDOW (parent_window)), +#endif "help:mate-system-log", gtk_get_current_event_time (), &error); --- a/mate-dictionary/src/gdict-applet.c +++ b/mate-dictionary/src/gdict-applet.c @@ -131,7 +131,12 @@ set_window_default_size (GdictApplet *ap gint width, height; gint font_size; GdkDisplay *display; +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor_num; +#else + GdkScreen *screen; + int monitor_num; +#endif GtkRequisition req; GdkRectangle monitor; @@ -155,9 +160,16 @@ set_window_default_size (GdictApplet *ap /* ... but make it no larger than half the monitor size */ display = gtk_widget_get_display (widget); +#if GTK_CHECK_VERSION (3, 22, 0) monitor_num = gdk_display_get_monitor_at_window (display, gtk_widget_get_window (widget)); gdk_monitor_get_geometry (monitor_num, &monitor); +#else + screen = gdk_display_get_default_screen (display); + monitor_num = gdk_screen_get_monitor_at_window (screen, + gtk_widget_get_window (widget)); + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); +#endif width = MIN (width, monitor.width / 2); height = MIN (height, monitor.height / 2); @@ -716,9 +729,15 @@ gdict_applet_cmd_help (GtkAction *action { GError *err = NULL; +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (NULL, "help:mate-dictionary/mate-dictionary-applet", gtk_get_current_event_time (), &err); +#else + gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (applet)), + "help:mate-dictionary/mate-dictionary-applet", + gtk_get_current_event_time (), &err); +#endif if (err) { --- a/mate-dictionary/src/gdict-pref-dialog.c +++ b/mate-dictionary/src/gdict-pref-dialog.c @@ -484,9 +484,15 @@ response_cb (GtkDialog *dialog, switch (response_id) { case GTK_RESPONSE_HELP: +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (dialog), "help:mate-dictionary/mate-dictionary-preferences", gtk_get_current_event_time (), &err); +#else + gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), + "help:mate-dictionary/mate-dictionary-preferences", + gtk_get_current_event_time (), &err); +#endif if (err) { GtkWidget *error_dialog; --- a/mate-dictionary/src/gdict-source-dialog.c +++ b/mate-dictionary/src/gdict-source-dialog.c @@ -469,9 +469,15 @@ gdict_source_dialog_response_cb (GtkDial build_new_source (GDICT_SOURCE_DIALOG (dialog)); break; case GTK_RESPONSE_HELP: +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (dialog), "help:mate-dictionary/mate-dictionary-add-source", gtk_get_current_event_time (), &err); +#else + gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), + "help:mate-dictionary/mate-dictionary-add-source", + gtk_get_current_event_time (), &err); +#endif if (err) { gdict_show_gerror_dialog (GTK_WINDOW (dialog), --- a/mate-dictionary/src/gdict-window.c +++ b/mate-dictionary/src/gdict-window.c @@ -1244,9 +1244,15 @@ gdict_window_cmd_help_contents (GtkActio g_return_if_fail (GDICT_IS_WINDOW (window)); +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (window), "help:mate-dictionary", gtk_get_current_event_time (), &err); +#else + gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (window)), + "help:mate-dictionary", + gtk_get_current_event_time (), &err); +#endif if (err) { gdict_show_gerror_dialog (GTK_WINDOW (window), --- a/mate-screenshot/src/mate-screenshot.c +++ b/mate-screenshot/src/mate-screenshot.c @@ -126,10 +126,17 @@ display_help (GtkWindow *parent) { GError *error = NULL; +#if GTK_CHECK_VERSION (3, 22, 0) gtk_show_uri_on_window (parent, "help:mate-user-guide/goseditmainmenu-53", gtk_get_current_event_time (), &error); +#else + gtk_show_uri (gtk_window_get_screen (parent), + "help:mate-user-guide/goseditmainmenu-53", + gtk_get_current_event_time (), + &error); +#endif if (error) { --- a/mate-screenshot/src/screenshot-utils.c +++ b/mate-screenshot/src/screenshot-utils.c @@ -471,7 +471,11 @@ make_region_with_monitors (GdkScreen *sc int i; display = gdk_screen_get_display (screen); +#if GTK_CHECK_VERSION (3, 22, 0) num_monitors = gdk_display_get_n_monitors (display); +#else + num_monitors = gdk_screen_get_n_monitors (screen); +#endif region = cairo_region_create (); @@ -479,7 +483,11 @@ make_region_with_monitors (GdkScreen *sc { GdkRectangle rect; +#if GTK_CHECK_VERSION (3, 22, 0) gdk_monitor_get_geometry (gdk_display_get_monitor (display, i), &rect); +#else + gdk_screen_get_monitor_geometry (screen, i, &rect); +#endif cairo_region_union_rectangle (region, &rect); }
