Attachment 844760 Details for Bug 972351 – Adjusted patch for apply cleanly to (installed) glib2-devel-2.36.3-4.fc19.x86_64

[patch] Adjusted patch for apply cleanly to (installed) glib2-devel-2.36.3-4.fc19.x86_64

bz972351.patch (text/plain), 1.73 KB, created by Jan Pokorný [poki] on 2014-01-02 22:49:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Pokorný [poki]

Created: 2014-01-02 22:49:33 UTC

Size: 1.73 KB

patch

obsolete

>Original at https://bugzilla.gnome.org/show_bug.cgi?id=613732,
>adjusted for glib2-devel-2.36.3-4.fc19.x86_64
>
>--- gobject.py.orig	2011-08-16 02:51:30.000000000 +0200
>+++ gobject.py	2014-01-02 21:09:19.682089918 +0100
>@@ -1,7 +1,15 @@
>+import os.path
> import gdb
> import glib
>-import gdb.backtrace
>-import gdb.command.backtrace
>+try:
>+    import gdb.backtrace
>+    import gdb.command.backtrace
>+except ImportError:
>+    print(os.path.basename(__file__) + ": gdb was not built with "
>+          "custom backtrace support, disabling.")
>+    HAVE_GDB_BACKTRACE = 0
>+else:
>+    HAVE_GDB_BACKTRACE = 1
> 
> # This is not quite right, as local vars may override symname
> def read_global_var (symname):
>@@ -107,13 +115,14 @@
>         return getattr (self.frame, name)
> 
> # Monkey patch FrameWrapper to avoid IA__ in symbol names
>-old__init__ = gdb.command.backtrace.FrameWrapper.__init__
>-def monkey_patched_init(self, frame):
>-    name = frame.name()
>-    if name and name.startswith("IA__"):
>-        frame = GFrameWrapper(frame)
>-    old__init__(self,frame)
>-gdb.command.backtrace.FrameWrapper.__init__ = monkey_patched_init
>+if HAVE_GDB_BACKTRACE:
>+    old__init__ = gdb.command.backtrace.FrameWrapper.__init__
>+    def monkey_patched_init(self, frame):
>+        name = frame.name()
>+        if name and name.startswith("IA__"):
>+            frame = GFrameWrapper(frame)
>+        old__init__(self,frame)
>+    gdb.command.backtrace.FrameWrapper.__init__ = monkey_patched_init
> 
> class DummyFrame:
>     def __init__ (self, frame):
>@@ -301,5 +310,6 @@
>     if obj == None:
>         obj = gdb
> 
>-    gdb.backtrace.push_frame_filter (GFrameFilter)
>+    if HAVE_GDB_BACKTRACE:
>+        gdb.backtrace.push_frame_filter (GFrameFilter)
>     obj.pretty_printers.append(pretty_printer_lookup)

Actions: View | Diff

Attachments on bug 972351: 844760 | 852842