Hello community, here is the log from the commit of package mate-calc for openSUSE:Factory checked in at 2018-03-20 21:56:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-calc (Old) and /work/SRC/openSUSE:Factory/.mate-calc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-calc" Tue Mar 20 21:56:53 2018 rev:3 rq:586545 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mate-calc/mate-calc.changes 2017-11-09 13:57:01.488804277 +0100 +++ /work/SRC/openSUSE:Factory/.mate-calc.new/mate-calc.changes 2018-03-20 21:57:17.344316269 +0100 @@ -1,0 +2,14 @@ +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. + * Add an icon image on the close button in the Preferences + dialogue. + * Avoid deprecated GtkStock. + * math-window: Don't use deprecated gtk_show_uri(). + * Add the missing window icon to the About dialogue. + * Update translations. +- Add mate-calc-gtk-3.20.patch: Restore GLib 2.48 and + GTK+ 3.20 support. + +------------------------------------------------------------------- Old: ---- mate-calc-1.18.1.tar.xz New: ---- mate-calc-1.20.0.tar.xz mate-calc-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-calc.spec ++++++ --- /var/tmp/diff_new_pack.eFPUaq/_old 2018-03-20 21:57:18.948258518 +0100 +++ /var/tmp/diff_new_pack.eFPUaq/_new 2018-03-20 21:57:18.952258374 +0100 @@ -1,7 +1,7 @@ # # spec file for package mate-calc # -# 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,15 +16,17 @@ # -%define _version 1.18 +%define _version 1.20 Name: mate-calc -Version: 1.18.1 +Version: 1.20.0 Release: 0 Summary: MATE Desktop calculator application -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 +# PATCH-FEATURE-OPENSUSE mate-calc-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch0: mate-calc-gtk-3.20.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -33,9 +35,10 @@ BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: yelp-tools -BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-2.0) >= 2.48 +BuildRequires: pkgconfig(glib-2.0) >= 2.48 BuildRequires: pkgconfig(gmodule-export-2.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(libxml-2.0) Recommends: %{name}-lang %glib2_gsettings_schema_requires @@ -50,6 +53,7 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen @@ -62,6 +66,7 @@ %suse_update_desktop_file %{name} %fdupes %{buildroot}%{_datadir}/ +%if 0%{?suse_version} < 1500 %post %desktop_database_post %glib2_gsettings_schema_post @@ -69,9 +74,15 @@ %postun %desktop_database_postun %glib2_gsettings_schema_postun +%endif %files -%doc ChangeLog README COPYING +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc ChangeLog README %{_bindir}/mate-calc %{_bindir}/mate-calc-cmd %{_bindir}/mate-calculator ++++++ mate-calc-1.18.1.tar.xz -> mate-calc-1.20.0.tar.xz ++++++ ++++ 36518 lines of diff (skipped) ++++++ mate-calc-gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -19,9 +19,9 @@ dnl #################################### dnl Dependencies dnl ########################################################################### -GLIB_REQUIRED=2.50.0 +GLIB_REQUIRED=2.48.0 GIO_REQUIRED=2.36.0 -GTK_REQUIRED=3.22.0 +GTK_REQUIRED=3.20.0 PKG_CHECK_MODULES(MATE_CALC, [ gtk+-3.0 >= $GTK_REQUIRED --- a/src/math-window.c +++ b/src/math-window.c @@ -199,11 +199,18 @@ static void redo_cb(GtkWidget *widget, M static void help_cb(GtkWidget *widget, MathWindow *window) { GError *error = NULL; +#if GTK_CHECK_VERSION(3, 22, 0) gtk_show_uri_on_window(GTK_WINDOW(window), "help:mate-calc", gtk_get_current_event_time(), &error); +#else + gtk_show_uri(gtk_window_get_screen(GTK_WINDOW(window)), + "help:mate-calc", + gtk_get_current_event_time(), + &error); +#endif if (error != NULL) {
