r45614 - in /desktop/experimental/glib2.0/debian: changelog patches/0001-GOptionContext-Don-t-crash-without-main-group.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Jul 29 15:30:13 2015
New Revision: 45614

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45614
Log:
debian/patches/0001-GOptionContext-Don-t-crash-without-main-group.patch:
Cherry-pick. Don't crash in GOptionContext if there's no main group.

Added:
    desktop/experimental/glib2.0/debian/patches/0001-GOptionContext-Don-t-crash-without-main-group.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=45614&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Wed Jul 29 15:30:13 2015
@@ -1,3 +1,11 @@
+glib2.0 (2.45.4-2) UNRELEASED; urgency=medium
+
+  * debian/patches/0001-GOptionContext-Don-t-crash-without-main-group.patch:
+    Cherry-pick. Don't crash in GOptionContext if there's no main group. Fixes
+    crash when running (for example) gdbus.
+
+ -- Iain Lane <iain at orangesquash.org.uk>  Wed, 29 Jul 2015 16:08:12 +0100
+
 glib2.0 (2.45.4-1) experimental; urgency=medium
 
   * New upstream release 2.45.4

Added: desktop/experimental/glib2.0/debian/patches/0001-GOptionContext-Don-t-crash-without-main-group.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-GOptionContext-Don-t-crash-without-main-group.patch?rev=45614&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-GOptionContext-Don-t-crash-without-main-group.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-GOptionContext-Don-t-crash-without-main-group.patch	[utf-8] Wed Jul 29 15:30:13 2015
@@ -0,0 +1,35 @@
+From 08a3f3f3d2190c7ff393ea13c5a310ba8a13a2e0 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Mon, 27 Jul 2015 07:52:27 -0400
+Subject: [PATCH] GOptionContext: Don't crash without main group
+
+This was introduced in 126c685f4aa and caused e.g. gdbus
+to crash when called without arguments.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=752210
+
+Applied-Upstream: 2.45.90
+
+---
+ glib/goption.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glib/goption.c b/glib/goption.c
+index 8a1848d..0464c2e 100644
+--- a/glib/goption.c
++++ b/glib/goption.c
+@@ -854,9 +854,9 @@ g_option_context_get_help (GOptionContext *context,
+         }
+     }
+ 
+-  g_string_append_printf (string, "%s\n  %s", _("Usage:"), g_get_prgname());
++  g_string_append_printf (string, "%s\n  %s", _("Usage:"), g_get_prgname ());
+   if (context->help_enabled ||
+-      context->main_group->n_entries > 0 ||
++      (context->main_group && context->main_group->n_entries > 0) ||
+       context->groups != NULL)
+     g_string_append_printf (string, " %s", _("[OPTION...]"));
+ 
+-- 
+2.4.6
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=45614&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Wed Jul 29 15:30:13 2015
@@ -12,3 +12,4 @@
 0001-timer-test-use-volatile-for-locals.patch
 skip-broken-timer-test.patch
 0001-Fix-trashing-on-overlayfs.patch
+0001-GOptionContext-Don-t-crash-without-main-group.patch