Hello community, here is the log from the commit of package mate-session-manager for openSUSE:Factory checked in at 2018-03-20 21:57:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-session-manager (Old) and /work/SRC/openSUSE:Factory/.mate-session-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-session-manager" Tue Mar 20 21:57:34 2018 rev:24 rq:586583 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-session-manager/mate-session-manager.changes 2017-11-09 13:58:04.062524716 +0100 +++ /work/SRC/openSUSE:Factory/.mate-session-manager.new/mate-session-manager.changes 2018-03-20 21:58:04.826606631 +0100 @@ -1,0 +2,13 @@ +Fri Mar 9 19:10:07 UTC 2018 - sor.ale...@meowr.ru + +- Update to version 1.20.0: + * Require GTK+ 3.22 and GLib 2.50. + * Avoid deprecated gdk_screen_get_number(), + gdk_screen_make_display_name() functions. + * Don't use deprecated gtk_show_uri(). + * gsm-manager.c: Fix a build warning. + * Update translations. +- Add mate-session-manager-gtk-3.20.patch: Restore GLib 2.48 and + GTK+ 3.20 support. + +------------------------------------------------------------------- Old: ---- mate-session-manager-1.18.2.tar.xz New: ---- mate-session-manager-1.20.0.tar.xz mate-session-manager-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-session-manager.spec ++++++ --- /var/tmp/diff_new_pack.5mMW6n/_old 2018-03-20 21:58:05.582579411 +0100 +++ /var/tmp/diff_new_pack.5mMW6n/_new 2018-03-20 21:58:05.582579411 +0100 @@ -1,7 +1,7 @@ # # spec file for package mate-session-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,12 +16,12 @@ # -%define _version 1.18 +%define _version 1.20 Name: mate-session-manager -Version: 1.18.2 +Version: 1.20.0 Release: 0 Summary: MATE Session Manager -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/Other Url: https://mate-desktop.org/ Source: http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz @@ -31,14 +31,16 @@ Source2: README.Gsettings-overrides # PATCH-FIX-OPENSUSE mate-session-manager-qt-5.7-styleoverride.patch sor.ale...@meowr.ru -- On Qt 5.7+ use Gtk2 Platform Theme. Patch0: mate-session-manager-qt-5.7-styleoverride.patch +# PATCH-FEATURE-OPENSUSE mate-session-manager-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch1: mate-session-manager-gtk-3.20.patch BuildRequires: hicolor-icon-theme BuildRequires: mate-common >= %{_version} BuildRequires: pkgconfig BuildRequires: update-desktop-files 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(ice) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(sm) @@ -51,7 +53,7 @@ Requires(postun): update-alternatives Recommends: %{name}-lang %glib2_gsettings_schema_requires -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1500 # Make native styling in Qt5 happen. Requires: libqt5-qtstyleplugins-platformtheme-gtk2 %endif @@ -95,6 +97,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 cp -a %{SOURCE2} . cp -a %{SOURCE1} mate_defaults.conf @@ -104,7 +107,7 @@ --disable-static \ --enable-ipv6 \ --with-default-wm=marco \ -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} >= 1500 --enable-qt57-theme-support \ %else --disable-qt57-theme-support \ @@ -114,7 +117,8 @@ %install %make_install -install -Dpm 0644 mate_defaults.conf %{buildroot}%{_sysconfdir}/mate_defaults.conf +install -Dpm 0644 mate_defaults.conf \ + %{buildroot}%{_sysconfdir}/mate_defaults.conf mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop @@ -126,14 +130,14 @@ %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/mate.desktop %post -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %icon_theme_cache_post %endif %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ default-xsession.desktop %{_datadir}/xsessions/mate.desktop 20 %postun -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %icon_theme_cache_postun %endif if [ ! -f %{_datadir}/xsessions/mate.desktop ]; then @@ -141,7 +145,7 @@ %{_datadir}/xsessions/mate.desktop fi -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %post gschemas %glib2_gsettings_schema_post @@ -150,7 +154,12 @@ %endif %files -%doc COPYING NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc NEWS README %ghost %{_sysconfdir}/alternatives/default-xsession.desktop %{_bindir}/mate-* %{_datadir}/%{name}/ ++++++ mate-session-manager-1.18.2.tar.xz -> mate-session-manager-1.20.0.tar.xz ++++++ ++++ 38257 lines of diff (skipped) ++++++ mate-session-manager-gtk-3.20.patch ++++++ --- a/capplet/main.c +++ b/capplet/main.c @@ -43,8 +43,14 @@ static void dialog_response(GsmPropertie if (response_id == GTK_RESPONSE_HELP) { error = NULL; +#if GTK_CHECK_VERSION(3, 22, 0) gtk_show_uri_on_window (GTK_WINDOW (dialog), "help:mate-user-guide/gosstartsession-2", gtk_get_current_event_time (), &error); +#else + gtk_show_uri(gtk_window_get_screen(GTK_WINDOW(dialog)), + "help:mate-user-guide/gosstartsession-2", + gtk_get_current_event_time(), &error); +#endif if (error != NULL) { --- a/configure.ac +++ b/configure.ac @@ -35,9 +35,9 @@ if test "x$enable_deprecations" = "xyes" AC_SUBST([DISABLE_DEPRECATED_CFLAGS]) fi -GLIB_REQUIRED=2.50.0 +GLIB_REQUIRED=2.48.0 GIO_REQUIRED=2.25.0 -GTK_REQUIRED=3.22.0 +GTK_REQUIRED=3.20.0 DBUS_GLIB_REQUIRED=0.76 dnl ====================================================================