Hello community, here is the log from the commit of package pluma for openSUSE:Factory checked in at 2016-02-22 08:58:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pluma (Old) and /work/SRC/openSUSE:Factory/.pluma.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pluma" Changes: -------- --- /work/SRC/openSUSE:Factory/pluma/pluma.changes 2015-12-01 09:20:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pluma.new/pluma.changes 2016-02-22 08:58:12.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Feb 18 17:54:13 UTC 2016 - [email protected] + +- Update to 1.12.2: + * Python console plugin: Fix missing icon in plugin list. + * Fix possible use-after-free during incremental search. + * GTK+3: Fix incremental search entry colour when text isn't + found. + +------------------------------------------------------------------- Old: ---- pluma-1.12.1.tar.xz New: ---- pluma-1.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pluma.spec ++++++ --- /var/tmp/diff_new_pack.V3sjLm/_old 2016-02-22 08:58:13.000000000 +0100 +++ /var/tmp/diff_new_pack.V3sjLm/_new 2016-02-22 08:58:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pluma # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -18,7 +18,7 @@ %define _version 1.12 Name: pluma -Version: 1.12.1 +Version: 1.12.2 Release: 0 Summary: Text editor for the MATE desktop License: GPL-2.0+ @@ -32,7 +32,7 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(gtk+-2.0) -BuildRequires: pkgconfig(gtksourceview-3.0) +BuildRequires: pkgconfig(gtksourceview-2.0) BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(mate-desktop-2.0) >= %{_version} BuildRequires: pkgconfig(pygobject-2.0) @@ -60,9 +60,9 @@ %package devel Summary: Small and lightweight UTF-8 text editor -Group: Development/Libraries/Other +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: pkgconfig(gtksourceview-3.0) +Requires: pkgconfig(gtksourceview-2.0) # mate-text-editor-devel was last used in openSUSE 13.1. Provides: mate-text-editor-devel = %{version} Obsoletes: mate-text-editor-devel < %{version} ++++++ pluma-1.12.1.tar.xz -> pluma-1.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/ChangeLog new/pluma-1.12.2/ChangeLog --- old/pluma-1.12.1/ChangeLog 2015-11-30 09:28:05.000000000 +0100 +++ new/pluma-1.12.2/ChangeLog 2016-02-15 14:15:39.000000000 +0100 @@ -1,6 +1,64 @@ +commit 515bd4604c38d3f8941b2e91d988daa3b744374d +Author: monsta <[email protected]> +Date: 2016-02-15 + + Release 1.12.2 + +M NEWS +M configure.ac + +commit 2c27ba6b33398d17c58329c8a75a60eebbbed439 +Author: monsta <[email protected]> +Date: 2016-02-10 + + plugins: use correct icon name for python console plugin + +M plugins/pythonconsole/pythonconsole.pluma-plugin.desktop.in + +commit 3e7e440bd1e4b525411660e55a318210c60ee660 +Author: Monsta <[email protected]> +Date: 2016-01-02 + + fix typo + + closes https://github.com/mate-desktop/pluma/issues/167 + +M pluma/pluma-commands-search.c +M pluma/pluma-document.c + +commit 2f89a4feeae5fdf3915be3357fedfeb7e9c05408 +Author: Monsta <[email protected]> +Date: 2015-12-25 + + view: fix incremental search entry color when text isn't found (GTK+3) + + color and bg color depend on theme, so it won't always be white-on-red + as in GTK+2 build + +M pluma/pluma-view.c + +commit 3709dc03c4f9a8c98099666419bda06a1bc419b2 +Author: Monsta <[email protected]> +Date: 2015-12-25 + + view: use "entry state" term, not "entry background" + +M pluma/pluma-view.c + +commit d5e14f93693ba01a41f3ea8bc1f70bafcd89d62a +Author: monsta <[email protected]> +Date: 2015-12-25 + + fix possible use-after-free during incremental search + + adapted from + https://git.gnome.org/browse/gedit/commit/?id=f8508ca201e7d16fa5e18a6130f456fdd3fc0c99 + +M pluma/pluma-view.c + commit 234d31adff2a88de5adc1e68a3bfb9d0904bf70c Author: monsta <[email protected]> -Date: 2015-11-30 +Date: 2015-11-30 Bump version to 1.12.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/NEWS new/pluma-1.12.2/NEWS --- old/pluma-1.12.1/NEWS 2015-11-30 09:25:05.000000000 +0100 +++ new/pluma-1.12.2/NEWS 2016-02-15 14:12:46.000000000 +0100 @@ -1,3 +1,10 @@ +pluma 1.12.2 +============ + + * Python console plugin: fix missing icon in plugin list + * Fix possible use-after-free during incremental search + * GTK+3: fix incremental search entry color when text isn't found + pluma 1.12.1 ============ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/configure new/pluma-1.12.2/configure --- old/pluma-1.12.1/configure 2015-11-30 09:26:18.000000000 +0100 +++ new/pluma-1.12.2/configure 2016-02-15 14:14:29.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pluma 1.12.1. +# Generated by GNU Autoconf 2.69 for pluma 1.12.2. # # Report bugs to <https://github.com/mate-desktop/pluma/issues>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='pluma' PACKAGE_TARNAME='pluma' -PACKAGE_VERSION='1.12.1' -PACKAGE_STRING='pluma 1.12.1' +PACKAGE_VERSION='1.12.2' +PACKAGE_STRING='pluma 1.12.2' PACKAGE_BUGREPORT='https://github.com/mate-desktop/pluma/issues' PACKAGE_URL='http://mate-desktop.org' @@ -1492,7 +1492,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pluma 1.12.1 to adapt to many kinds of systems. +\`configure' configures pluma 1.12.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1562,7 +1562,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pluma 1.12.1:";; + short | recursive ) echo "Configuration of pluma 1.12.2:";; esac cat <<\_ACEOF @@ -1726,7 +1726,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pluma configure 1.12.1 +pluma configure 1.12.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2095,7 +2095,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pluma $as_me 1.12.1, which was +It was created by pluma $as_me 1.12.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2460,9 +2460,9 @@ PLUMA_MINOR_VERSION=12 -$as_echo "#define PLUMA_MICRO_VERSION 1" >>confdefs.h +$as_echo "#define PLUMA_MICRO_VERSION 2" >>confdefs.h -PLUMA_MICRO_VERSION=1 +PLUMA_MICRO_VERSION=2 am__api_version='1.14' @@ -2980,7 +2980,7 @@ # Define the identity of the package. PACKAGE='pluma' - VERSION='1.12.1' + VERSION='1.12.2' cat >>confdefs.h <<_ACEOF @@ -16502,7 +16502,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pluma $as_me 1.12.1, which was +This file was extended by pluma $as_me 1.12.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16569,7 +16569,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pluma config.status 1.12.1 +pluma config.status 1.12.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/configure.ac new/pluma-1.12.2/configure.ac --- old/pluma-1.12.1/configure.ac 2015-11-30 09:24:09.000000000 +0100 +++ new/pluma-1.12.2/configure.ac 2016-02-15 12:58:22.000000000 +0100 @@ -4,7 +4,7 @@ m4_define(pluma_major_version, 1) m4_define(pluma_minor_version, 12) -m4_define(pluma_micro_version, 1) +m4_define(pluma_micro_version, 2) m4_define(pluma_version, pluma_major_version.pluma_minor_version.pluma_micro_version) AC_INIT([pluma], [pluma_version], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/data/pluma.desktop.in new/pluma-1.12.2/data/pluma.desktop.in --- old/pluma-1.12.1/data/pluma.desktop.in 2015-11-30 09:26:25.000000000 +0100 +++ new/pluma-1.12.2/data/pluma.desktop.in 2016-02-15 14:14:36.000000000 +0100 @@ -15,5 +15,5 @@ X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=Pluma X-MATE-Bugzilla-Component=general -X-MATE-Bugzilla-Version=1.12.1 +X-MATE-Bugzilla-Version=1.12.2 X-MATE-Bugzilla-ExtraInfoScript=/usr/local/libexec/pluma/pluma-bugreport.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/docs/reference/html/PlumaMessageType.html new/pluma-1.12.2/docs/reference/html/PlumaMessageType.html --- old/pluma-1.12.1/docs/reference/html/PlumaMessageType.html 2015-11-30 09:28:04.000000000 +0100 +++ new/pluma-1.12.2/docs/reference/html/PlumaMessageType.html 2016-02-15 14:15:38.000000000 +0100 @@ -184,7 +184,7 @@ </div> <div class="refsect1"> <a name="PlumaMessageType.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html";>GBoxed</a> +<pre class="screen"> GBoxed <span class="lineart">╰──</span> PlumaMessageType </pre> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/docs/reference/html/pluma-pluma-document.html new/pluma-1.12.2/docs/reference/html/pluma-pluma-document.html --- old/pluma-1.12.1/docs/reference/html/pluma-pluma-document.html 2015-11-30 09:28:04.000000000 +0100 +++ new/pluma-1.12.2/docs/reference/html/pluma-pluma-document.html 2016-02-15 14:15:38.000000000 +0100 @@ -974,7 +974,7 @@ <div class="refsect2"> <a name="PlumaDocument--enable-search-highlighting"></a><h3>The <code class="literal">“enable-search-highlighting”</code> property</h3> <pre class="programlisting"> “enable-search-highlighting” <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean";><span class="type">gboolean</span></a></pre> -<p>Whether all the occurences of the searched string must be highlighted.</p> +<p>Whether all the occurrences of the searched string must be highlighted.</p> <p>Flags: Read / Write</p> <p>Default value: FALSE</p> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/docs/reference/html/pluma-pluma-encodings.html new/pluma-1.12.2/docs/reference/html/pluma-pluma-encodings.html --- old/pluma-1.12.1/docs/reference/html/pluma-pluma-encodings.html 2015-11-30 09:28:04.000000000 +0100 +++ new/pluma-1.12.2/docs/reference/html/pluma-pluma-encodings.html 2016-02-15 14:15:38.000000000 +0100 @@ -136,7 +136,7 @@ </div> <div class="refsect1"> <a name="pluma-pluma-encodings.object-hierarchy"></a><h2>Object Hierarchy</h2> -<pre class="screen"> <a href="https://developer.gnome.org/gobject/unstable/gobject-Boxed-Types.html";>GBoxed</a> +<pre class="screen"> GBoxed <span class="lineart">╰──</span> PlumaEncoding </pre> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/plugins/pythonconsole/pythonconsole.pluma-plugin.desktop.in new/pluma-1.12.2/plugins/pythonconsole/pythonconsole.pluma-plugin.desktop.in --- old/pluma-1.12.1/plugins/pythonconsole/pythonconsole.pluma-plugin.desktop.in 2015-09-25 15:08:01.000000000 +0200 +++ new/pluma-1.12.2/plugins/pythonconsole/pythonconsole.pluma-plugin.desktop.in 2016-02-15 12:58:13.000000000 +0100 @@ -4,7 +4,7 @@ IAge=2 _Name=Python Console _Description=Interactive Python console standing in the bottom panel -Icon=mate-mime-text-x-python +Icon=gnome-mime-text-x-python Authors=Steve Frécinaux <[email protected]> Copyright=Copyright © 2006 Steve Frécinaux Website=http://www.mate-desktop.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/pluma/pluma-commands-search.c new/pluma-1.12.2/pluma/pluma-commands-search.c --- old/pluma-1.12.1/pluma/pluma-commands-search.c 2015-09-25 15:08:01.000000000 +0200 +++ new/pluma-1.12.2/pluma/pluma-commands-search.c 2016-02-10 15:44:48.000000000 +0100 @@ -103,7 +103,7 @@ &data->y); } -/* Use occurences only for Replace All */ +/* Use occurrences only for Replace All */ static void text_found (PlumaWindow *window, gint occurrences) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/pluma/pluma-document.c new/pluma-1.12.2/pluma/pluma-document.c --- old/pluma-1.12.1/pluma/pluma-document.c 2015-09-28 16:43:47.000000000 +0200 +++ new/pluma-1.12.2/pluma/pluma-document.c 2016-02-15 12:58:13.000000000 +0100 @@ -508,7 +508,7 @@ g_object_class_install_property (object_class, PROP_ENABLE_SEARCH_HIGHLIGHTING, g_param_spec_boolean ("enable-search-highlighting", "Enable Search Highlighting", - "Whether all the occurences of the searched string must be highlighted", + "Whether all the occurrences of the searched string must be highlighted", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pluma-1.12.1/pluma/pluma-view.c new/pluma-1.12.2/pluma/pluma-view.c --- old/pluma-1.12.1/pluma/pluma-view.c 2015-09-28 16:43:47.000000000 +0200 +++ new/pluma-1.12.2/pluma/pluma-view.c 2016-02-15 12:58:13.000000000 +0100 @@ -169,7 +169,7 @@ { PLUMA_SEARCH_ENTRY_NORMAL, PLUMA_SEARCH_ENTRY_NOT_FOUND -} PlumaSearchEntryBgColor; +} PlumaSearchEntryState; static void document_read_only_notify_handler (PlumaDocument *document, @@ -756,11 +756,18 @@ } static void -set_entry_background (GtkWidget *entry, - PlumaSearchEntryBgColor col) +set_entry_state (GtkWidget *entry, + PlumaSearchEntryState state) { - if (col == PLUMA_SEARCH_ENTRY_NOT_FOUND) +#if GTK_CHECK_VERSION (3, 0 ,0) + GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (entry)); +#endif + + if (state == PLUMA_SEARCH_ENTRY_NOT_FOUND) { +#if GTK_CHECK_VERSION (3, 0 ,0) + gtk_style_context_add_class (context, GTK_STYLE_CLASS_ERROR); +#else GdkColor red; GdkColor white; @@ -775,15 +782,20 @@ gtk_widget_modify_text (entry, GTK_STATE_NORMAL, &white); +#endif } else /* reset */ { +#if GTK_CHECK_VERSION (3, 0 ,0) + gtk_style_context_remove_class (context, GTK_STYLE_CLASS_ERROR); +#else gtk_widget_modify_base (entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_text (entry, GTK_STATE_NORMAL, NULL); +#endif } } @@ -892,13 +904,13 @@ { pluma_view_scroll_to_cursor (view); - set_entry_background (view->priv->search_entry, - PLUMA_SEARCH_ENTRY_NORMAL); + set_entry_state (view->priv->search_entry, + PLUMA_SEARCH_ENTRY_NORMAL); } else { - set_entry_background (view->priv->search_entry, - PLUMA_SEARCH_ENTRY_NOT_FOUND); + set_entry_state (view->priv->search_entry, + PLUMA_SEARCH_ENTRY_NOT_FOUND); } return found; @@ -1620,12 +1632,11 @@ guint old_find_flags = 0; gint sel_len = 0; - g_free (view->priv->old_search_text); - old_find_text = pluma_document_get_search_text (PLUMA_DOCUMENT (buffer), &old_find_flags); if (old_find_text != NULL) { + g_free (view->priv->old_search_text); view->priv->old_search_text = old_find_text; add_search_completion_entry (old_find_text); } @@ -1758,11 +1769,11 @@ pluma_view_scroll_to_cursor (view); if (!moved || !moved_offset) - set_entry_background (view->priv->search_entry, - PLUMA_SEARCH_ENTRY_NOT_FOUND); + set_entry_state (view->priv->search_entry, + PLUMA_SEARCH_ENTRY_NOT_FOUND); else - set_entry_background (view->priv->search_entry, - PLUMA_SEARCH_ENTRY_NORMAL); + set_entry_state (view->priv->search_entry, + PLUMA_SEARCH_ENTRY_NORMAL); } } }
