Hello community, here is the log from the commit of package mate-desktop for openSUSE:Factory checked in at 2018-03-20 21:57:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-desktop (Old) and /work/SRC/openSUSE:Factory/.mate-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-desktop" Tue Mar 20 21:57:01 2018 rev:19 rq:586558 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-desktop/mate-desktop.changes 2018-01-24 15:32:31.180707032 +0100 +++ /work/SRC/openSUSE:Factory/.mate-desktop.new/mate-desktop.changes 2018-03-20 21:57:25.928007205 +0100 @@ -1,0 +2,24 @@ +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 Global Menu support. + * Avoid deprecated gdk_screen_get_width/height(). + * mate-desktop-item, mate-about: Avoid deprecated gtk_show_uri(). + * mate-about: Avoid deprecated gtk_show_uri(). + * Avoid deprecated gdk_screen_get_monitor_, + gdk_screen_get_n_monitors(), gdk_screen_make_display_name(), + gdk_screen_get_number() functions. + * Correct little imprecision in man mate-about. + * Fix broken fallback cursor in mate-colorsel.c. + * mate-colorsel: Don't use deprecated GtkStock. + * Drop MateAboutDialog and switch to GtkAboutDialog. + * mate-about: Remove remains of libunique references. + * An implementation of WidthOfScreen and HeightOfScreen. + * gschema: Drop the can-change-accels key, won't work with GTK+3. + * Add gsettings for window scaling factor. + * Update translations. +- Add mate-desktop-gtk-3.20.patch: Restore GLib 2.48 and GTK+ 3.20 + support. + +------------------------------------------------------------------- Old: ---- mate-desktop-1.18.0.tar.xz New: ---- mate-desktop-1.20.0.tar.xz mate-desktop-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-desktop.spec ++++++ --- /var/tmp/diff_new_pack.NlCcD6/_old 2018-03-20 21:57:26.731978258 +0100 +++ /var/tmp/diff_new_pack.NlCcD6/_new 2018-03-20 21:57:26.731978258 +0100 @@ -19,25 +19,27 @@ %define soname libmate-desktop-2 %define sover 17 %define typelib typelib-1_0-MateDesktop-2_0 -%define _version 1.18 +%define _version 1.20 Name: mate-desktop -Version: 1.18.0 +Version: 1.20.0 Release: 0 Summary: Library with common API for various MATE modules -License: GPL-2.0+ AND LGPL-2.1+ AND MIT +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/GUI/Other Url: https://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz Source1: user-dirs-update-mate.desktop +# PATCH-FEATURE-OPENSUSE mate-desktop-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch0: mate-desktop-gtk-3.20.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: libxml2-python BuildRequires: mate-common >= %{_version} BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(dconf) >= 0.13.4 -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.48 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.7 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(python) @@ -54,7 +56,7 @@ %package -n %{soname}-%{sover} Summary: Library with common API for various MATE modules -License: GPL-2.0+ AND LGPL-2.1+ AND MIT +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/Libraries Requires: %{name}-gschemas >= %{version} @@ -66,7 +68,7 @@ %package -n %{typelib} Summary: Common API for various MATE modules typelib -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other %description -n %{typelib} @@ -75,7 +77,7 @@ %package gschemas Summary: MATE Desktop GSchemas -License: GPL-2.0+ AND LGPL-2.1+ AND MIT +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/Libraries Requires: %{name}-gschemas-branding >= %{version} # mate-desktop-gsettings-schemas was last used in openSUSE Leap 42.1. @@ -89,7 +91,7 @@ %package gschemas-branding-upstream Summary: MATE Desktop GSchemas -- Upstream default settings -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Requires: %{name}-gschemas = %{version} Supplements: packageand(%{name}-gschemas:branding-upstream) @@ -104,7 +106,7 @@ %package devel Summary: MATE module API library development files -License: GPL-2.0+ AND LGPL-2.1+ AND MIT +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: Development/Libraries/Other Requires: %{soname}-%{sover} = %{version} @@ -113,6 +115,7 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen @@ -135,6 +138,7 @@ rm -rf %{buildroot}%{_datadir}/help/*/gpl rm -rf %{buildroot}%{_datadir}/help/*/lgpl +%if 0%{?suse_version} < 1500 %post %desktop_database_post @@ -152,13 +156,19 @@ %postun gschemas-branding-upstream %glib2_gsettings_schema_postun +%endif %post -n %{soname}-%{sover} -p /sbin/ldconfig %postun -n %{soname}-%{sover} -p /sbin/ldconfig %files -%doc AUTHORS COPYING +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS %dir %{_datadir}/mate-about %{_sysconfdir}/xdg/autostart/user-dirs-update-mate.desktop %{_bindir}/mate-about ++++++ mate-desktop-1.18.0.tar.xz -> mate-desktop-1.20.0.tar.xz ++++++ ++++ 107428 lines of diff (skipped) ++++++ mate-desktop-gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -96,9 +96,9 @@ else EXTERNAL_PNP_IDS="$with_pnp_ids_path" fi -GLIB_REQUIRED=2.50.0 +GLIB_REQUIRED=2.48.0 GIO_REQUIRED=2.26.0 -GTK_REQUIRED=3.22.0 +GTK_REQUIRED=3.20.0 XRANDR_REQUIRED=1.3 dnl ---------------------------------------------------------------------------- --- a/libmate-desktop/mate-bg.c +++ b/libmate-desktop/mate-bg.c @@ -850,9 +850,15 @@ draw_color_each_monitor (MateBG *bg, int monitor; display = gdk_screen_get_display (screen); +#if GTK_CHECK_VERSION (3, 22, 0) num_monitors = gdk_display_get_n_monitors (display); for (monitor = 0; monitor < num_monitors; monitor++) { gdk_monitor_get_geometry (gdk_display_get_monitor (display, monitor), &rect); +#else + num_monitors = gdk_screen_get_n_monitors (screen); + for (monitor = 0; monitor < num_monitors; monitor++) { + gdk_screen_get_monitor_geometry (screen, monitor, &rect); +#endif draw_color_area (bg, dest, &rect); } } @@ -1026,14 +1032,22 @@ draw_each_monitor (MateBG *bg, GdkDisplay *display; display = gdk_screen_get_display (screen); +#if GTK_CHECK_VERSION (3, 22, 0) gint num_monitors = gdk_display_get_n_monitors (display); +#else + gint num_monitors = gdk_screen_get_n_monitors (screen); +#endif gint monitor = 0; for (; monitor < num_monitors; monitor++) { GdkRectangle rect; GdkPixbuf *pixbuf; +#if GTK_CHECK_VERSION (3, 22, 0) gdk_monitor_get_geometry (gdk_display_get_monitor (display, monitor), &rect); +#else + gdk_screen_get_monitor_geometry (screen, monitor, &rect); +#endif pixbuf = get_pixbuf_for_size (bg, monitor, rect.width, rect.height); if (pixbuf) { --- a/libmate-desktop/mate-bg-crossfade.c +++ b/libmate-desktop/mate-bg-crossfade.c @@ -411,6 +411,7 @@ draw_background (MateBGCrossfade *fade) if (fade->priv->widget != NULL) { gtk_widget_queue_draw (fade->priv->widget); } else if (gdk_window_get_window_type (fade->priv->window) != GDK_WINDOW_ROOT) { +#if GTK_CHECK_VERSION (3, 22, 0) cairo_t *cr; cairo_region_t *region; GdkDrawingContext *draw_context; @@ -424,6 +425,16 @@ draw_background (MateBGCrossfade *fade) cairo_paint (cr); gdk_window_end_draw_frame (fade->priv->window, draw_context); cairo_region_destroy (region); +#else + cairo_pattern_t *pattern; + + pattern = + cairo_pattern_create_for_surface (fade->priv->fading_surface); + gdk_window_set_background_pattern (fade->priv->window, pattern); + cairo_pattern_destroy (pattern); + gdk_window_invalidate_rect (fade->priv->window, NULL, FALSE); + gdk_window_process_updates (fade->priv->window, FALSE); +#endif } else { Display *xdisplay = GDK_WINDOW_XDISPLAY (fade->priv->window); gdk_error_trap_push (); --- a/libmate-desktop/mate-desktop-item.c +++ b/libmate-desktop/mate-desktop-item.c @@ -2080,10 +2080,17 @@ mate_desktop_item_launch_on_screen_with_ return -1; } +#if GTK_CHECK_VERSION (3, 22, 0) retval = gtk_show_uri_on_window (NULL, url, GDK_CURRENT_TIME, error); +#else + retval = gtk_show_uri (screen, + url, + GDK_CURRENT_TIME, + error); +#endif return retval ? 0 : -1; } --- a/libmate-desktop/mate-rr-labeler.c +++ b/libmate-desktop/mate-rr-labeler.c @@ -363,11 +363,22 @@ position_window (MateRRLabeler *labeler { GdkRectangle workarea; GdkRectangle monitor; +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor_num; +#else + int monitor_num; +#endif get_work_area (labeler, &workarea); +#if GTK_CHECK_VERSION (3, 22, 0) monitor_num = gdk_display_get_monitor_at_point (gdk_screen_get_display (labeler->priv->screen), x, y); gdk_monitor_get_geometry (monitor_num, &monitor); +#else + monitor_num = gdk_screen_get_monitor_at_point (labeler->priv->screen, x, y); + gdk_screen_get_monitor_geometry (labeler->priv->screen, + monitor_num, + &monitor); +#endif gdk_rectangle_intersect (&monitor, &workarea, &workarea); gtk_window_move (GTK_WINDOW (window), workarea.x, workarea.y);
