r51780 - in /desktop/unstable/gedit/debian: changelog patches/09_fix_plugin_load_segfault.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Fri Dec  2 16:59:27 2016
New Revision: 51780

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51780
Log:
Add debian/patches/09_fix_plugin_load_segfault.patch from upstream
(Closes: #770153)

Added:
    desktop/unstable/gedit/debian/patches/09_fix_plugin_load_segfault.patch
Modified:
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/patches/series

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=51780&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog	[utf-8] Fri Dec  2 16:59:27 2016
@@ -1,3 +1,11 @@
+gedit (3.22.0-2) unstable; urgency=medium
+
+  [ Pietro Battiston ]
+  * Add debian/patches/09_fix_plugin_load_segfault.patch from upstream
+    (Closes: #770153)
+
+ -- Andreas Henriksson <andreas at fatal.se>  Fri, 02 Dec 2016 17:50:37 +0100
+
 gedit (3.22.0-1) unstable; urgency=medium
 
   [ Andreas Henriksson ]

Added: desktop/unstable/gedit/debian/patches/09_fix_plugin_load_segfault.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/09_fix_plugin_load_segfault.patch?rev=51780&op=file
==============================================================================
--- desktop/unstable/gedit/debian/patches/09_fix_plugin_load_segfault.patch	(added)
+++ desktop/unstable/gedit/debian/patches/09_fix_plugin_load_segfault.patch	[utf-8] Fri Dec  2 16:59:27 2016
@@ -0,0 +1,29 @@
+Description: fix segfault when loading plugins which extend menus
+ This patch integrates upstream commits
+ f4ecdcb8807fec2594f62bf7a7f179063f31e41b
+ and
+ 3bdfa5764deb9909dae9ef041a7e9b6d6297341a
+ The latter is only a style fix, but will make merging new upstream release
+ straightforward.
+Author: Pietro Battiston <me at pietrobattiston.it>
+Bug-Debian: https://bugs.debian.org/770153
+Origin: upstream, https://bugzilla.gnome.org/show_bug.cgi?id=737781
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=737781
+Forwarded: not-needed
+Last-Update: 2016-11-30
+
+---
+--- gedit-3.22.0.orig/gedit/gedit-app.c
++++ gedit-3.22.0/gedit/gedit-app.c
+@@ -1712,6 +1712,11 @@ find_extension_point_section (GMenuModel
+ 
+ 			subsection = g_menu_model_get_item_link (model, i, G_MENU_LINK_SECTION);
+ 
++			if (subsection == NULL)
++			{
++				subsection = model;
++			}
++
+ 			j_items = g_menu_model_get_n_items (subsection);
+ 
+ 			for (j = 0; j < j_items && !section; j++)

Modified: desktop/unstable/gedit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/series?rev=51780&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/series	[utf-8] Fri Dec  2 16:59:27 2016
@@ -1,3 +1,4 @@
 01_gedit-bugreport-location.patch
 03_no_gnu_gettext.patch
 08_multiarch_fallback.patch
+09_fix_plugin_load_segfault.patch