Hello community, here is the log from the commit of package pluma for openSUSE:Factory checked in at 2018-03-20 21:57:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pluma (Old) and /work/SRC/openSUSE:Factory/.pluma.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pluma" Tue Mar 20 21:57:58 2018 rev:17 rq:586609 version:1.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pluma/pluma.changes 2017-11-16 14:02:05.831271116 +0100 +++ /work/SRC/openSUSE:Factory/.pluma.new/pluma.changes 2018-03-20 21:58:24.353903541 +0100 @@ -1,0 +2,34 @@ +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. + * Double click to the right of the last open tab to open a new + tab. + * Support new location of the Gtk bookmarks file. + * docs: We have encodings combobox, not option menu. + * Remove references to PlumaStatus. + * docs: Remove some references to nonexistent stuff. + * filebrowser: Don't parse .hidden files - GIO does it since + 2.36. + * Don't request to save documents with no changes. + * Add a gsettings key to hide/show(default) tabs with the side + pane. + * Hide tabs if the sidebar is used. + * Enable the ability to save the document if it was changed + externally. + * Disable the ability to save the document if it has no changes. + * pluma-window: Have GtkRecentData on stack instead of allocating + it. + * An implementation of WidthOfScreen and HeightOfScreen. + * Fix regexp replacement with backreferences (e.g. "\0"). + * Make sure pluma opens in the same window of the workspace. + * Add a gsettings key: Show save confirmation if the files have + changes. + * Put "peas_engine_enable_loader" in the correct pl. + * Make the list of recently used files work again. + * Fix some deprecations. + * Silent some build warnings. + * Update translations. +- Add pluma-gtk-3.20.patch: Restore GLib 2.48 and GTK+ 3.20 support. + +------------------------------------------------------------------- Old: ---- pluma-1.18.3.tar.xz New: ---- pluma-1.20.0.tar.xz pluma-gtk-3.20.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pluma.spec ++++++ --- /var/tmp/diff_new_pack.yDLrmG/_old 2018-03-20 21:58:25.141875170 +0100 +++ /var/tmp/diff_new_pack.yDLrmG/_new 2018-03-20 21:58:25.141875170 +0100 @@ -1,7 +1,7 @@ # # spec file for package pluma # -# 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 @@ -17,24 +17,26 @@ %define typelib typelib-1_0-Pluma-1_0 -%define _version 1.18 +%define _version 1.20 Name: pluma -Version: 1.18.3 +Version: 1.20.0 Release: 0 Summary: Text editor for the MATE desktop -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 pluma-gtk-3.20.patch -- Restore GLib 2.48 and GTK+ 3.20 support. +Patch0: pluma-gtk-3.20.patch BuildRequires: fdupes BuildRequires: mate-common >= %{_version} BuildRequires: pkgconfig -BuildRequires: python-libxml2 BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(enchant) +BuildRequires: pkgconfig(glib-2.0) >= 2.48 BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.14 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libpeas-gtk-1.0) @@ -90,6 +92,7 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 mate-autogen @@ -105,20 +108,25 @@ %post /sbin/ldconfig -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %desktop_database_post %glib2_gsettings_schema_post %endif %postun /sbin/ldconfig -%if 0%{?suse_version} <= 1320 +%if 0%{?suse_version} < 1500 %desktop_database_postun %glib2_gsettings_schema_postun %endif %files -%doc AUTHORS COPYING NEWS README +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc AUTHORS NEWS README %{_bindir}/%{name} %{_datadir}/%{name}/ %{_libdir}/%{name}/ ++++++ pluma-1.18.3.tar.xz -> pluma-1.20.0.tar.xz ++++++ ++++ 93764 lines of diff (skipped) ++++++ pluma-gtk-3.20.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -142,16 +142,16 @@ fi AM_CONDITIONAL(ENABLE_ENCHANT, test x"$enable_enchant" = "xyes") -GTK_REQUIRED=3.22.0 +GTK_REQUIRED=3.20.0 GTKSOURCEVIEW_REQUIRED=3.0.0 PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) PKG_CHECK_MODULES(PLUMA, [ libxml-2.0 >= 2.5.0 - glib-2.0 >= 2.50.0 + glib-2.0 >= 2.48.0 $GMODULE_ADD gthread-2.0 >= 2.13.0 - gio-2.0 >= 2.50.0 + gio-2.0 >= 2.48.0 gtk+-3.0 >= $GTK_REQUIRED gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED libpeas-1.0 >= 1.2.0 --- a/plugins/filebrowser/pluma-file-browser-widget.c +++ b/plugins/filebrowser/pluma-file-browser-widget.c @@ -2473,7 +2473,11 @@ directory_open (PlumaFileBrowserWidget * if (FILE_IS_DIR (flags)) { result = TRUE; +#if GTK_CHECK_VERSION (3, 22, 0) if (!gtk_show_uri_on_window (NULL, uri, GDK_CURRENT_TIME, &error)) { +#else + if (!gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (obj)), uri, GDK_CURRENT_TIME, &error)) { +#endif g_signal_emit (obj, signals[ERROR], 0, PLUMA_FILE_BROWSER_ERROR_OPEN_DIRECTORY, error->message); --- a/pluma/pluma-help.c +++ b/pluma/pluma-help.c @@ -63,10 +63,17 @@ pluma_help_display (GtkWindow *parent, else link = g_strdup_printf ("help:%s", name); +#if GTK_CHECK_VERSION (3, 22, 0) ret = gtk_show_uri_on_window (parent, link, GDK_CURRENT_TIME, &error); +#else + ret = gtk_show_uri (gtk_window_get_screen (parent), + link, + GDK_CURRENT_TIME, + &error); +#endif g_free (link); --- a/pluma/pluma-window.c +++ b/pluma/pluma-window.c @@ -2828,9 +2828,16 @@ fullscreen_controls_show (PlumaWindow *w screen = gtk_window_get_screen (GTK_WINDOW (window)); display = gdk_screen_get_display (screen); +#if GTK_CHECK_VERSION (3, 22, 0) gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display, gtk_widget_get_window (GTK_WIDGET (window))), &fs_rect); +#else + gdk_screen_get_monitor_geometry (screen, + gdk_screen_get_monitor_at_window (screen, + gtk_widget_get_window (GTK_WIDGET (window))), + &fs_rect); +#endif gtk_window_get_size (GTK_WINDOW (window->priv->fullscreen_controls), &w, &h); @@ -2855,10 +2862,17 @@ run_fullscreen_animation (gpointer data) screen = gtk_window_get_screen (GTK_WINDOW (window)); display = gdk_screen_get_display (screen); +#if GTK_CHECK_VERSION (3, 22, 0) gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display, gtk_widget_get_window (GTK_WIDGET (window))), &fs_rect); - +#else + gdk_screen_get_monitor_geometry (screen, + gdk_screen_get_monitor_at_window (screen, + gtk_widget_get_window (GTK_WIDGET (window))), + &fs_rect); +#endif + gtk_window_get_position (GTK_WINDOW (window->priv->fullscreen_controls), &x, &y); @@ -2932,9 +2946,16 @@ show_hide_fullscreen_toolbar (PlumaWindo screen = gtk_window_get_screen (GTK_WINDOW (window)); display = gdk_screen_get_display (screen); +#if GTK_CHECK_VERSION (3, 22, 0) gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display, gtk_widget_get_window (GTK_WIDGET (window))), &fs_rect); +#else + gdk_screen_get_monitor_geometry (screen, + gdk_screen_get_monitor_at_window (screen, + gtk_widget_get_window (GTK_WIDGET (window))), + &fs_rect); +#endif if (show) gtk_window_move (GTK_WINDOW (window->priv->fullscreen_controls),
