r36498 - in /desktop/unstable/gjs/debian: changelog patches/11_revert_abi_breakage.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Dec 20 00:07:22 2012
New Revision: 36498

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36498
Log:
11_revert_abi_breakage.patch: new patch. Revert the ABI breakage 
introduced by 03_gerror_details.patch.

Added:
    desktop/unstable/gjs/debian/patches/11_revert_abi_breakage.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=36498&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gjs/debian/changelog [utf-8] Thu Dec 20 00:07:22 2012
@@ -1,3 +1,10 @@
+gjs (1.32.0-5) UNRELEASED; urgency=low
+
+  * 11_revert_abi_breakage.patch: new patch. Revert the ABI breakage 
+    introduced by 03_gerror_details.patch.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 20 Dec 2012 01:05:56 +0100
+
 gjs (1.32.0-4) unstable; urgency=low
 
   * 04_gjs_dumpstack.patch: patch from upstream git. Fix the 

Added: desktop/unstable/gjs/debian/patches/11_revert_abi_breakage.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/patches/11_revert_abi_breakage.patch?rev=36498&op=file
==============================================================================
--- desktop/unstable/gjs/debian/patches/11_revert_abi_breakage.patch (added)
+++ desktop/unstable/gjs/debian/patches/11_revert_abi_breakage.patch [utf-8] Thu Dec 20 00:07:22 2012
@@ -1,0 +1,75 @@
+Index: gjs-1.32.0/gi/gerror.c
+===================================================================
+--- gjs-1.32.0.orig/gi/gerror.c	2012-12-20 00:49:02.670259754 +0100
++++ gjs-1.32.0/gi/gerror.c	2012-12-20 01:05:37.971125507 +0100
+@@ -520,6 +520,9 @@ find_error_domain_info(GQuark domain)
+     return info;
+ }
+ 
++/* Temporary hack to avoid breaking ABI */
++new_gjs_context_print_stack_to_buffer(GjsContext* context, void *initial, GString *buf);
++
+ /* define properties that JS Error() expose, such as
+    fileName, lineNumber and stack
+ */
+@@ -553,7 +556,7 @@ define_error_properties(JSContext *conte
+ 
+     stack = g_string_new(NULL);
+     gjs_context = JS_GetContextPrivate(context);
+-    gjs_context_print_stack_to_buffer(gjs_context, frame, stack);
++    new_gjs_context_print_stack_to_buffer(gjs_context, frame, stack);
+ 
+     if (gjs_string_from_utf8(context, stack->str, stack->len, &v))
+         JS_DefineProperty(context, obj, "stack", v,
+Index: gjs-1.32.0/gjs/context.h
+===================================================================
+--- gjs-1.32.0.orig/gjs/context.h	2012-12-20 00:49:02.670259754 +0100
++++ gjs-1.32.0/gjs/context.h	2012-12-20 00:58:13.732953760 +0100
+@@ -68,11 +68,7 @@ gboolean        gjs_context_define_strin
+ GList*          gjs_context_get_all              (void);
+ void*           gjs_context_get_native_context   (GjsContext *js_context);
+ 
+-/* initial_frame is a JSStackFrame, but cannot be exposed as such in the
+-   public API. Pass NULL to get the topmost frame.
+-*/
+ void            gjs_context_print_stack_to_buffer (GjsContext *js_context,
+-                                                   void       *initial_frame,
+                                                    GString    *buf);
+ 
+ void            gjs_context_print_stack_stderr    (GjsContext *js_context);
+Index: gjs-1.32.0/gjs/stack.c
+===================================================================
+--- gjs-1.32.0.orig/gjs/stack.c	2012-12-20 00:49:02.690259856 +0100
++++ gjs-1.32.0/gjs/stack.c	2012-12-20 01:03:28.702493578 +0100
+@@ -203,8 +203,9 @@ format_frame(JSContext* cx, JSStackFrame
+     JS_LeaveLocalRootScope(cx);
+ }
+ 
+-void
+-gjs_context_print_stack_to_buffer(GjsContext* context, void *initial, GString *buf)
++
++void __attribute__((visibility("hidden")))
++new_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;
+@@ -222,12 +223,18 @@ gjs_context_print_stack_to_buffer(GjsCon
+ }
+ 
+ void
++gjs_context_print_stack_to_buffer(GjsContext* context, GString *buf)
++{
++    new_gjs_context_print_stack_to_buffer(context, NULL, buf);
++}
++
++void
+ gjs_context_print_stack_stderr(GjsContext *context)
+ {
+   GString *str = g_string_new("");
+ 
+   g_string_append_printf(str, "== Stack trace for context %p ==\n", context);
+-  gjs_context_print_stack_to_buffer(context, NULL, str);
++  gjs_context_print_stack_to_buffer(context, str);
+ 
+   g_printerr("%s\n", str->str);
+   g_string_free(str, TRUE);

Modified: desktop/unstable/gjs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/patches/series?rev=36498&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gjs/debian/patches/series [utf-8] Thu Dec 20 00:07:22 2012
@@ -2,3 +2,4 @@
 02_gerror_class.patch
 03_gerror_details.patch
 04_gjs_dumpstack.patch
+11_revert_abi_breakage.patch