Attachment 852842 Details for Bug 972351 – patch against the build tree

[patch] patch against the build tree

0001-Don-t-install-frame-filters-when-GDB-does-not-suppor.patch (text/plain), 3.08 KB, created by Matěj Cepl on 2014-01-20 20:42:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matěj Cepl

Created: 2014-01-20 20:42:35 UTC

Size: 3.08 KB

patch

obsolete

>From 6a4f1fd30e6f1ee59f0f24dbf6019e3a6c8e539a Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@redhat.com>
>Date: Mon, 20 Jan 2014 21:40:17 +0100
>Subject: [PATCH] Don't install frame filters when GDB does not support them
>
>From https://bugzilla.gnome.org/show_bug.cgi?id=613732
>---
> glib2.spec                                         |  2 +
> ...me-filters-when-GDB-does-not-support-them.patch | 50 ++++++++++++++++++++++
> 2 files changed, 52 insertions(+)
> create mode 100644 no-frame-filters-when-GDB-does-not-support-them.patch
>
>diff --git a/glib2.spec b/glib2.spec
>index 5cb8463..30ef12c 100644
>--- a/glib2.spec
>+++ b/glib2.spec
>@@ -8,6 +8,7 @@ URL: http://www.gtk.org
> #VCS: git:git://git.gnome.org/glib
> Source: http://download.gnome.org/sources/glib/2.36/glib-%{version}.tar.xz
> Patch0: 0001-Revert-g_file_set_contents-don-t-fsync-on-ext3-4.patch
>+Patch1: no-frame-filters-when-GDB-does-not-support-them.patch
> 
> BuildRequires: pkgconfig
> BuildRequires: gettext
>@@ -66,6 +67,7 @@ The glib2-fam package contains the FAM (File Alteration Monitor) module for GIO.
> %prep
> %setup -q -n glib-%{version}
> %patch0 -p1
>+%patch1 -p1
> 
> autoreconf -i -f
> 
>diff --git a/no-frame-filters-when-GDB-does-not-support-them.patch b/no-frame-filters-when-GDB-does-not-support-them.patch
>new file mode 100644
>index 0000000..9f1857e
>--- /dev/null
>+++ b/no-frame-filters-when-GDB-does-not-support-them.patch
>@@ -0,0 +1,50 @@
>+--- a/gobject/gobject.py
>++++ b/gobject/gobject.py
>+@@ -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 @@ class GFrameWrapper:
>+         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 @@ def register (obj):
>+     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)
>-- 
>1.8.5.2.192.g7794a68
>

Actions: View | Diff

Attachments on bug 972351: 844760 | 852842