r36455 - in /desktop/unstable/gjs/debian: changelog patches/04_gjs_dumpstack.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Dec 12 10:40:39 2012
New Revision: 36455

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36455
Log:
04_gjs_dumpstack.patch: patch from upstream git. Fix the 
gjs_dumpstack function after the changes introduced by 1.32.0-3.
Thanks to Nils Thykier’s awesome review for spotting this.

Added:
    desktop/unstable/gjs/debian/patches/04_gjs_dumpstack.patch
Modified:
    desktop/unstable/gjs/debian/changelog
    desktop/unstable/gjs/debian/patches/series

Modified: desktop/unstable/gjs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/changelog?rev=36455&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gjs/debian/changelog [utf-8] Wed Dec 12 10:40:39 2012
@@ -1,3 +1,11 @@
+gjs (1.32.0-4) UNRELEASED; urgency=low
+
+  * 04_gjs_dumpstack.patch: patch from upstream git. Fix the 
+    gjs_dumpstack function after the changes introduced by 1.32.0-3.
+    Thanks to Nils Thykier’s awesome review for spotting this.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 12 Dec 2012 11:39:20 +0100
+
 gjs (1.32.0-3) unstable; urgency=low
 
   * 02_gerror_class.patch, 03_gerror_details.patch: patches from 

Added: desktop/unstable/gjs/debian/patches/04_gjs_dumpstack.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/patches/04_gjs_dumpstack.patch?rev=36455&op=file
==============================================================================
--- desktop/unstable/gjs/debian/patches/04_gjs_dumpstack.patch (added)
+++ desktop/unstable/gjs/debian/patches/04_gjs_dumpstack.patch [utf-8] Wed Dec 12 10:40:39 2012
@@ -1,0 +1,30 @@
+From 5c90e776ce3c096bccba5ad111bf6c80b9cfb060 Mon Sep 17 00:00:00 2001
+From: Jasper St. Pierre <jstpierre at mecheye.net>
+Date: Thu, 13 Sep 2012 22:48:27 +0000
+Subject: stack: Fix gjs_dumpstack
+
+We need to iterate the stack here at least once or the while
+loop will terminate early.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683992
+---
+diff --git a/gjs/stack.c b/gjs/stack.c
+index 84e1c6a..8013e30 100644
+--- a/gjs/stack.c
++++ b/gjs/stack.c
+@@ -207,9 +207,12 @@ void
+ gjs_context_print_stack_to_buffer(GjsContext* context, void *initial, GString *buf)
+ {
+     JSContext *js_context = (JSContext*)gjs_context_get_native_context(context);
+-    JSStackFrame* fp = initial;
++    JSStackFrame *fp = initial;
+     int num = 0;
+ 
++    if (fp == NULL)
++        JS_FrameIterator(js_context, &fp);
++
+     while (fp) {
+         format_frame(js_context, fp, buf, num);
+         num++;
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gjs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/patches/series?rev=36455&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gjs/debian/patches/series [utf-8] Wed Dec 12 10:40:39 2012
@@ -1,3 +1,4 @@
 0001-Fold-libgjs-gdbus.so-into-libgjs.so.patch
 02_gerror_class.patch
 03_gerror_details.patch
+04_gjs_dumpstack.patch