Hello community, here is the log from the commit of package mate-media for openSUSE:Factory checked in at 2018-03-20 21:57:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-media (Old) and /work/SRC/openSUSE:Factory/.mate-media.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-media" Tue Mar 20 21:57:37 2018 rev:14 rq:586585 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-media/mate-media.changes 2017-11-14 12:49:37.699614060 +0100 +++ /work/SRC/openSUSE:Factory/.mate-media.new/mate-media.changes 2018-03-20 21:58:06.354551616 +0100 @@ -1,0 +2,15 @@ +Fri Mar 9 19:10:07 UTC 2018 - [email protected] + +- Update to version 1.20.0: + * Require GTK+ 3.22 and GLib 2.50. + * volume-control-dialog: Avoid deprecated GtkAlignment. + * applet: Improve volume increments. + * Avoid deprecated gdk_screen_get_monitor_, + gdk_screen_get_height() functions. + * applet: Use GdkSeat. + * gvc-applet: Don't try to increase refcount of a NULL object. + * gvc-combo-box: Fix signal arguments. +- Add mate-media-gtk-3.20.patch: Restore GLib 2.48 and GTK+ 3.20 + support. + +------------------------------------------------------------------- Old: ---- mate-media-1.18.2.tar.xz New: ---- mate-media-1.20.0.tar.xz mate-media-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-media.spec ++++++ --- /var/tmp/diff_new_pack.oRXZc2/_old 2018-03-20 21:58:07.270518636 +0100 +++ /var/tmp/diff_new_pack.oRXZc2/_new 2018-03-20 21:58:07.274518492 +0100 @@ -1,7 +1,7 @@ # # spec file for package mate-media # -# 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,24 +16,26 @@ # -%define _version 1.18 +%define _version 1.20 Name: mate-media -Version: 1.18.2 +Version: 1.20.0 Release: 0 Summary: MATE Desktop multimedia stack -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-media-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch0: mate-media-gtk-3.20.patch BuildRequires: fdupes BuildRequires: itstool -BuildRequires: libxml2-python BuildRequires: mate-common >= %{_version} BuildRequires: mate-control-center-devel >= %{_version} BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 +BuildRequires: pkgconfig(glib-2.0) >= 2.48 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libmatemixer) >= %{_version} BuildRequires: pkgconfig(libxml-2.0) @@ -47,6 +49,7 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen @@ -63,7 +66,7 @@ %suse_update_desktop_file mate-volume-control %fdupes %{buildroot}%{_datadir}/ -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post %desktop_database_post %glib2_gsettings_schema_post @@ -74,7 +77,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-volume-control-applet.desktop %{_bindir}/mate-volume-control %{_bindir}/mate-volume-control-applet ++++++ mate-media-1.18.2.tar.xz -> mate-media-1.20.0.tar.xz ++++++ ++++ 7378 lines of diff (skipped) ++++++ mate-media-gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -32,9 +32,9 @@ AC_C_INLINE AC_TYPE_OFF_T AC_TYPE_SIZE_T -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 CANBERRA_REQUIRED_VERSION=0.13 MATE_MIXER_REQUIRED_VERSION=1.10.0 MATE_DESKTOP_REQUIRED_VERSION=1.17.0 --- a/mate-volume-control/gvc-stream-status-icon.c +++ b/mate-volume-control/gvc-stream-status-icon.c @@ -70,7 +70,11 @@ popup_dock (GvcStreamStatusIcon *icon, g GdkScreen *screen; int x; int y; +#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor_num; +#else + int monitor_num; +#endif GdkRectangle monitor; GtkRequisition dock_req; @@ -89,8 +93,13 @@ popup_dock (GvcStreamStatusIcon *icon, g gvc_channel_bar_set_orientation (GVC_CHANNEL_BAR (icon->priv->bar), 1 - orientation); +#if GTK_CHECK_VERSION (3, 22, 0) monitor_num = gdk_display_get_monitor_at_point (gdk_screen_get_display (screen), area.x, area.y); gdk_monitor_get_geometry (monitor_num, &monitor); +#else + monitor_num = gdk_screen_get_monitor_at_point (screen, area.x, area.y); + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); +#endif gtk_container_foreach (GTK_CONTAINER (icon->priv->dock), (GtkCallback) gtk_widget_show_all, NULL);
