rpms/insight/F-12 insight-6.8.1-baseclassfield.patch, NONE, 1.1 insight-6.8.1-sbrk.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 insight.desktop, 1.2, 1.3 insight.spec, 1.6, 1.7 sources, 1.2, 1.3

Patrick Monnerat monnerat at fedoraproject.org
Thu Jan 14 10:29:43 UTC 2010


Author: monnerat

Update of /cvs/pkgs/rpms/insight/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv325

Modified Files:
	.cvsignore insight.desktop insight.spec sources 
Added Files:
	insight-6.8.1-baseclassfield.patch insight-6.8.1-sbrk.patch 
Log Message:

* Wed Jan 13 2010 Patrick Monnerat <pm at datasphere.ch> 6.8.1-2
- New version.
- Patch "baseclassfield" to fix bug BZ 551126.
- Patch "sbrk" to enable sbrk() prototype on F13.
- Start a terminal for standard IO when invoked through desktop file.


insight-6.8.1-baseclassfield.patch:
 dwarf2read.c |   18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

--- NEW FILE insight-6.8.1-baseclassfield.patch ---
diff -Naur insight-6.8-1.orig/gdb/dwarf2read.c insight-6.8-1.new/gdb/dwarf2read.c
--- insight-6.8-1.orig/gdb/dwarf2read.c	2010-01-13 14:55:05.000000000 +0100
+++ insight-6.8-1.new/gdb/dwarf2read.c	2010-01-13 15:02:55.000000000 +0100
@@ -3593,9 +3593,21 @@
     {
       /* C++ base class field.  */
       attr = dwarf2_attr (die, DW_AT_data_member_location, cu);
-      if (attr)
-	FIELD_BITPOS (*fp) = (decode_locdesc (DW_BLOCK (attr), cu)
-			      * bits_per_byte);
+
+      if (attr) {
+	int byte_offset = 0;
+
+	if (attr_form_is_section_offset(attr))
+	  dwarf2_complex_location_expr_complaint();
+	else if (attr_form_is_constant(attr))
+	  byte_offset = dwarf2_get_attr_constant_value(attr, 0);
+	else if (attr_form_is_block(attr))
+	  byte_offset = decode_locdesc(DW_BLOCK(attr), cu);
+	else
+	  dwarf2_complex_location_expr_complaint();
+
+	FIELD_BITPOS(*fp) = byte_offset * bits_per_byte;
+      }
       FIELD_BITSIZE (*fp) = 0;
       FIELD_STATIC_KIND (*fp) = 0;
       FIELD_TYPE (*fp) = die_type (die, cu);

insight-6.8.1-sbrk.patch:
 event-top.c |    4 ++++
 main.c      |    4 ++++
 top.c       |    4 ++++
 3 files changed, 12 insertions(+)

--- NEW FILE insight-6.8.1-sbrk.patch ---
diff -Naur insight-6.8-1.orig/gdb/event-top.c insight-6.8-1.new/gdb/event-top.c
--- insight-6.8-1.orig/gdb/event-top.c	2008-01-01 23:53:09.000000000 +0100
+++ insight-6.8-1.new/gdb/event-top.c	2010-01-13 21:06:33.000000000 +0100
@@ -20,6 +20,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
+/* Enable sbrk() prototype. */
+#include <features.h>
+#undef __USE_XOPEN2K
+
 #include "defs.h"
 #include "top.h"
 #include "inferior.h"
diff -Naur insight-6.8-1.orig/gdb/main.c insight-6.8-1.new/gdb/main.c
--- insight-6.8-1.orig/gdb/main.c	2010-01-13 18:00:29.000000000 +0100
+++ insight-6.8-1.new/gdb/main.c	2010-01-13 20:52:02.000000000 +0100
@@ -19,6 +19,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* Enable sbrk() prototype. */
+#include <features.h>
+#undef __USE_XOPEN2K
+
 #include "defs.h"
 #include "top.h"
 #include "target.h"
diff -Naur insight-6.8-1.orig/gdb/top.c insight-6.8-1.new/gdb/top.c
--- insight-6.8-1.orig/gdb/top.c	2010-01-13 18:00:29.000000000 +0100
+++ insight-6.8-1.new/gdb/top.c	2010-01-13 21:08:35.000000000 +0100
@@ -19,6 +19,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* Enable sbrk() prototype. */
+#include <features.h>
+#undef __USE_XOPEN2K
+
 #include "defs.h"
 #include "gdbcmd.h"
 #include "call-cmds.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/insight/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	15 Oct 2008 09:26:52 -0000	1.2
+++ .cvsignore	14 Jan 2010 10:29:43 -0000	1.3
@@ -1 +1 @@
-insight-6.8.tar.bz2
+insight-6.8-1.tar.bz2


Index: insight.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/insight/F-12/insight.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- insight.desktop	2 Mar 2009 11:32:36 -0000	1.2
+++ insight.desktop	14 Jan 2010 10:29:43 -0000	1.3
@@ -5,6 +5,6 @@ GenericName=Insight Debugger
 Comment=GDB Debugger GUI
 Exec=insight
 Icon=insight
-Terminal=false
+Terminal=true
 Type=Application
 Categories=Development;Debugger;


Index: insight.spec
===================================================================
RCS file: /cvs/pkgs/rpms/insight/F-12/insight.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- insight.spec	25 Jul 2009 03:27:16 -0000	1.6
+++ insight.spec	14 Jan 2010 10:29:43 -0000	1.7
@@ -1,11 +1,13 @@
+%global ver	6.8-1
+
 Name:		insight
-Version:	6.8
-Release:	9%{?dist}
+Version:	%(echo %{ver} | tr - .)
+Release:	2%{?dist}
 Summary:	Graphical debugger based on GDB
 License:	GPLv3+
 Group:		Development/Debuggers
 Url:		http://sources.redhat.com/insight/
-Source0:	ftp://sourceware.org/pub/insight/releases/insight-%{version}.tar.bz2
+Source0:	ftp://sourceware.org/pub/insight/releases/insight-%{ver}.tar.bz2
 Source1:	insight.desktop
 Source2:	insight.1
 Patch1:		insight-6.8-warnings.patch
@@ -22,6 +24,8 @@ Patch11:	insight-6.8-lib64.patch
 Patch12:	insight-6.8-gcc44.patch
 Patch13:	insight-6.8-doubleinstall.patch
 Patch14:	insight-6.8-readline6.patch
+Patch15:	insight-6.8.1-baseclassfield.patch
+Patch16:	insight-6.8.1-sbrk.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:	iwidgets
 BuildRequires:	tcl-devel
@@ -48,7 +52,7 @@ GDB version 6.x.
 %prep 
 #-------------------------------------------------------------------------------
 
-%setup -q
+%setup -q -n insight-%{ver}
 %patch1 -p1 -b .warnings
 %patch2 -p1 -b .destdir
 %patch3 -p1 -b .derefbug
@@ -63,6 +67,8 @@ GDB version 6.x.
 %patch12 -p1 -b .gcc44
 %patch13 -p1 -b .doubleinstall
 %patch14 -p1 -b .readline6
+%patch15 -p1 -b .baseclassfield
+%patch16 -p1 -b .sbrk
 
 
 #-------------------------------------------------------------------------------
@@ -216,11 +222,19 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 #-------------------------------------------------------------------------------
 %changelog
+#-------------------------------------------------------------------------------
+
+* Wed Jan 13 2010 Patrick Monnerat <pm at datasphere.ch> 6.8.1-2
+- Patch "sbrk" to enable sbrk() prototype on F13.
+
+* Wed Jan 13 2010 Patrick Monnerat <pm at datasphere.ch> 6.8.1-1
+- New version.
+- Patch "baseclassfield" to fix bug BZ 551126.
+- Start a terminal for standard IO when invoked through desktop file.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6.8-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-#-------------------------------------------------------------------------------
-
 * Wed Jul 15 2009 Patrick Monnerat <pm at datasphere.ch> 6.8-8
 - Fix bug #511501: combobox.tcl installed twice causes build failure.
 - Patch "readline6" to use system readline version 6.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/insight/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	15 Oct 2008 09:26:53 -0000	1.2
+++ sources	14 Jan 2010 10:29:43 -0000	1.3
@@ -1 +1 @@
-b403972b35520399663c7054e8132ca9  insight-6.8.tar.bz2
+4ee9824c1e8d6108d886c6c09b24f0ac  insight-6.8-1.tar.bz2



More information about the scm-commits mailing list