rpms/gpsim/devel gpsim-0.22.0-gcc43.patch, NONE, 1.1 gpsim.spec, 1.17, 1.18 gpsim-0.21.11.happy_gcc, 1.3, NONE gpsim-0.21.11.ktechlab.patch, 1.1, NONE
Kevin Kofler
kkofler at fedoraproject.org
Sun Sep 7 19:31:55 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/gpsim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27978/devel
Modified Files:
gpsim.spec
Added Files:
gpsim-0.22.0-gcc43.patch
Removed Files:
gpsim-0.21.11.happy_gcc gpsim-0.21.11.ktechlab.patch
Log Message:
* Sun Sep 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.22.0-7
- Fix build with GCC 4.3 (#434061), patch by Vasile Gaburici, simpler fix for
the "list" name conflict from the Debian patch
gpsim-0.22.0-gcc43.patch:
--- NEW FILE gpsim-0.22.0-gcc43.patch ---
diff -up gpsim-0.22.0/cli/cmd_clear.cc.std gpsim-0.22.0/cli/cmd_clear.cc
--- gpsim-0.22.0/cli/cmd_clear.cc.std 2008-09-06 16:13:58.000000000 +0300
+++ gpsim-0.22.0/cli/cmd_clear.cc 2008-09-06 16:14:13.000000000 +0300
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */
#include <iostream>
#include <iomanip>
#include <string>
+#include <typeinfo>
#include "command.h"
#include "cmd_clear.h"
diff -up gpsim-0.22.0/cli/cmd_x.cc.std gpsim-0.22.0/cli/cmd_x.cc
--- gpsim-0.22.0/cli/cmd_x.cc.std 2008-09-06 16:18:07.000000000 +0300
+++ gpsim-0.22.0/cli/cmd_x.cc 2008-09-06 16:18:24.000000000 +0300
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA. */
#include <iostream>
#include <iomanip>
#include <string>
-
+#include <typeinfo>
#include "command.h"
#include "cmd_x.h"
diff -up gpsim-0.22.0/gui/gui_regwin.cc.std gpsim-0.22.0/gui/gui_regwin.cc
--- gpsim-0.22.0/gui/gui_regwin.cc.std 2008-09-06 16:22:59.000000000 +0300
+++ gpsim-0.22.0/gui/gui_regwin.cc 2008-09-06 16:24:07.000000000 +0300
@@ -24,6 +24,8 @@ Boston, MA 02111-1307, USA. */
#include <stdlib.h>
#include <errno.h>
+#include <typeinfo>
+
#include "../config.h"
#ifdef HAVE_GUI
diff -up gpsim-0.22.0/gui/gui_src.cc.std gpsim-0.22.0/gui/gui_src.cc
--- gpsim-0.22.0/gui/gui_src.cc.std 2008-09-06 16:25:21.000000000 +0300
+++ gpsim-0.22.0/gui/gui_src.cc 2008-09-06 16:25:35.000000000 +0300
@@ -23,6 +23,8 @@ Boston, MA 02111-1307, USA. */
#include <stdlib.h>
#include <errno.h>
+#include <typeinfo>
+
#include "../config.h"
#ifdef HAVE_GUI
diff -up gpsim-0.22.0/gui/gui_stack.cc.std gpsim-0.22.0/gui/gui_stack.cc
--- gpsim-0.22.0/gui/gui_stack.cc.std 2008-09-06 16:28:38.000000000 +0300
+++ gpsim-0.22.0/gui/gui_stack.cc 2008-09-06 16:29:33.000000000 +0300
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
+#include <typeinfo>
#include "../config.h"
#ifdef HAVE_GUI
diff -up gpsim-0.22.0/gui/gui_symbols.cc.std gpsim-0.22.0/gui/gui_symbols.cc
--- gpsim-0.22.0/gui/gui_symbols.cc.std 2008-09-06 16:26:48.000000000 +0300
+++ gpsim-0.22.0/gui/gui_symbols.cc 2008-09-06 16:27:19.000000000 +0300
@@ -23,6 +23,8 @@ Boston, MA 02111-1307, USA. */
#include <stdlib.h>
#include <errno.h>
+#include <typeinfo>
+
#include "../config.h"
#ifdef HAVE_GUI
diff -up gpsim-0.22.0/gui/settings_exdbm.cc.std gpsim-0.22.0/gui/settings_exdbm.cc
--- gpsim-0.22.0/gui/settings_exdbm.cc.std 2008-09-06 16:30:43.000000000 +0300
+++ gpsim-0.22.0/gui/settings_exdbm.cc 2008-09-06 16:32:10.000000000 +0300
@@ -20,7 +20,7 @@ the Free Software Foundation, 59 Temple
Boston, MA 02111-1307, USA. */
#include "settings_exdbm.h"
-
+#include <cstdlib>
SettingsEXdbm::SettingsEXdbm(const char *appl_name)
{
diff -up gpsim-0.22.0/modules/switch.cc.std gpsim-0.22.0/modules/switch.cc
--- gpsim-0.22.0/modules/switch.cc.std 2008-09-06 17:50:46.000000000 +0300
+++ gpsim-0.22.0/modules/switch.cc 2008-09-06 17:51:04.000000000 +0300
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA. */
/* IN_MODULE should be defined for modules */
#define IN_MODULE
+#include <typeinfo>
#include <time.h>
#include <stdio.h>
diff -up gpsim-0.22.0/src/gpsim_object.cc.std gpsim-0.22.0/src/gpsim_object.cc
--- gpsim-0.22.0/src/gpsim_object.cc.std 2008-09-06 16:40:43.000000000 +0300
+++ gpsim-0.22.0/src/gpsim_object.cc 2008-09-06 16:41:11.000000000 +0300
@@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA. */
#include <typeinfo>
+#include <cstring>
#include <stdio.h>
#include <ctype.h>
#include "gpsim_object.h"
diff -up gpsim-0.22.0/src/modules.cc.std gpsim-0.22.0/src/modules.cc
--- gpsim-0.22.0/src/modules.cc.std 2008-09-06 16:44:14.000000000 +0300
+++ gpsim-0.22.0/src/modules.cc 2008-09-06 16:44:50.000000000 +0300
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA. */
#include <ctype.h>
#include <errno.h>
#include <stdlib.h>
+#include <typeinfo>
#include <string>
#include <list>
#include <vector>
diff -up gpsim-0.22.0/src/modules.h.std gpsim-0.22.0/src/modules.h
--- gpsim-0.22.0/src/modules.h.std 2008-09-06 16:20:22.000000000 +0300
+++ gpsim-0.22.0/src/modules.h 2008-09-06 16:33:47.000000000 +0300
@@ -35,6 +35,8 @@ Boston, MA 02111-1307, USA. */
#include <string>
#include <map>
#include <vector>
+#include <cstdlib>
+#include <cstring>
#include <assert.h>
#include "gpsim_object.h"
diff -up gpsim-0.22.0/src/operator.cc.std gpsim-0.22.0/src/operator.cc
--- gpsim-0.22.0/src/operator.cc.std 2008-09-06 17:04:45.000000000 +0300
+++ gpsim-0.22.0/src/operator.cc 2008-09-06 17:20:15.000000000 +0300
@@ -1,3 +1,4 @@
+#include <typeinfo>
#include <iostream>
#include "operator.h"
diff -up gpsim-0.22.0/src/processor.cc.std gpsim-0.22.0/src/processor.cc
--- gpsim-0.22.0/src/processor.cc.std 2008-09-06 16:48:42.000000000 +0300
+++ gpsim-0.22.0/src/processor.cc 2008-09-06 16:49:08.000000000 +0300
@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA. */
*/
+#include <typeinfo>
#include <stdio.h>
#ifdef _WIN32
#include "uxtime.h"
diff -u --recursive gpsim-0.22.0-orig/src/processor.h gpsim-0.22.0/src/processor.h
--- gpsim-0.22.0-orig/src/processor.h 2006-10-18 20:16:30.000000000 -0400
+++ gpsim-0.22.0/src/processor.h 2008-05-29 22:04:31.000000000 -0400
@@ -395,7 +395,7 @@
/// (for those processors that support interrupts), the processor is
/// in a different 'state' then when the interrupt flag is cleared.
- list<ProgramMemoryAccess *> pma_context;
+ std::list<ProgramMemoryAccess *> pma_context;
/// Tracing
/// The readTT and writeTT are TraceType objects for tracing
diff -up gpsim-0.22.0/src/symbol.cc.std gpsim-0.22.0/src/symbol.cc
--- gpsim-0.22.0/src/symbol.cc.std 2008-09-06 16:50:23.000000000 +0300
+++ gpsim-0.22.0/src/symbol.cc 2008-09-06 16:51:18.000000000 +0300
@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA. */
//
#include "symbol.h"
+#include <typeinfo>
#include <iostream>
#include <iomanip>
#include <sstream>
diff -up gpsim-0.22.0/src/value.cc.std gpsim-0.22.0/src/value.cc
--- gpsim-0.22.0/src/value.cc.std 2008-09-06 17:20:33.000000000 +0300
+++ gpsim-0.22.0/src/value.cc 2008-09-06 17:20:43.000000000 +0300
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */
#include <stdio.h>
#include <iostream>
#include <iomanip>
+#include <typeinfo>
#include "processor.h"
diff -up gpsim-0.22.0/src/value.h.std gpsim-0.22.0/src/value.h
--- gpsim-0.22.0/src/value.h.std 2008-09-06 15:58:38.000000000 +0300
+++ gpsim-0.22.0/src/value.h 2008-09-06 16:08:24.000000000 +0300
@@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA. */
#ifndef __VALUE_H__
#define __VALUE_H__
+#include <cstring>
#include "gpsim_object.h"
#include <glib.h>
Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/devel/gpsim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gpsim.spec 19 Feb 2008 01:36:17 -0000 1.17
+++ gpsim.spec 7 Sep 2008 19:31:25 -0000 1.18
@@ -1,6 +1,6 @@
Name: gpsim
Version: 0.22.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers
Summary(fr): Un simulateur pour les microcontrôleurs PIC (TM) Microchip (TM)
@@ -8,6 +8,7 @@
License: GPLv2+
URL: http://www.dattalo.com/gnupic/gpsim.html
Source: http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
+Patch0: gpsim-0.22.0-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk+extra-devel, flex, readline-devel, popt-devel
@@ -43,6 +44,7 @@
%prep
%setup -q
+%patch0 -p1 -b .gcc43
%build
%configure
@@ -80,6 +82,10 @@
%{_includedir}/*
%changelog
+* Sun Sep 07 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.22.0-7
+- Fix build with GCC 4.3 (#434061), patch by Vasile Gaburici, simpler fix for
+ the "list" name conflict from the Debian patch
+
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.22.0-6
- Autorebuild for GCC 4.3
--- gpsim-0.21.11.happy_gcc DELETED ---
--- gpsim-0.21.11.ktechlab.patch DELETED ---
More information about the fedora-extras-commits
mailing list