rpms/gpsim/F-8 gpsim-0.22.0-acinclude.patch, NONE, 1.1 gpsim-0.22.0-gccfix.patch, NONE, 1.1 gpsim.spec, 1.16, 1.17 gpsim-0.21.11.happy_gcc, 1.3, NONE gpsim-0.21.11.ktechlab.patch, 1.1, NONE

Roy Rankin rrankin at fedoraproject.org
Tue Sep 9 05:23:48 UTC 2008


Author: rrankin

Update of /cvs/pkgs/rpms/gpsim/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2161

Modified Files:
	gpsim.spec 
Added Files:
	gpsim-0.22.0-acinclude.patch gpsim-0.22.0-gccfix.patch 
Removed Files:
	gpsim-0.21.11.happy_gcc gpsim-0.21.11.ktechlab.patch 
Log Message:
Changes for gcc 4.3 compatibility


gpsim-0.22.0-acinclude.patch:

--- NEW FILE gpsim-0.22.0-acinclude.patch ---
--- gpsim-0.22.0/acinclude.m4.debug	2006-11-02 14:43:21.000000000 +0900
+++ gpsim-0.22.0/acinclude.m4	2008-09-07 14:57:46.000000000 +0900
@@ -54,18 +54,6 @@
 dnl AC_CHECK_FUNC(rl_completion_append_character, [wi_cv_lib_readline=yes],[
 dnl 	wi_cv_lib_readline=no;wi_cv_lib_readline_result="no (it is present but too old to use)"
 dnl ])
-	AC_TRY_LINK([
-		/* includes */
-	],[
-		/* function-body */
-		readline(0);
-		rl_completion_append_character(0);
-	],[
-		wi_cv_lib_readline=yes
-	],[
-		wi_cv_lib_readline=no
-		wi_cv_lib_readline_result="no (it is present but too old to use)"
-	])
 
 if test "$wi_cv_lib_readline" = no ; then
 	LIBREADLINE=""

gpsim-0.22.0-gccfix.patch:

--- NEW FILE gpsim-0.22.0-gccfix.patch ---
diff --git a/cli/cmd_clear.cc b/cli/cmd_clear.cc
index e9a64db..e836053 100644
--- a/cli/cmd_clear.cc
+++ b/cli/cmd_clear.cc
@@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "command.h"
 #include "cmd_clear.h"
+#include <typeinfo>
 
 #include "../src/pic-processor.h"
 
diff --git a/cli/cmd_x.cc b/cli/cmd_x.cc
index 4ab5f88..37645a4 100644
--- a/cli/cmd_x.cc
+++ b/cli/cmd_x.cc
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <iostream>
 #include <iomanip>
 #include <string>
+#include <typeinfo>
 
 
 #include "command.h"
diff --git a/gui/gui_regwin.cc b/gui/gui_regwin.cc
index fc74be5..0a2d8ae 100644
--- a/gui/gui_regwin.cc
+++ b/gui/gui_regwin.cc
@@ -19,6 +19,7 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/gui/gui_src.cc b/gui/gui_src.cc
index 5e569a0..adcbd0e 100644
--- a/gui/gui_src.cc
+++ b/gui/gui_src.cc
@@ -19,6 +19,8 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/gui/gui_stack.cc b/gui/gui_stack.cc
index b318a85..2428615 100644
--- a/gui/gui_stack.cc
+++ b/gui/gui_stack.cc
@@ -19,6 +19,8 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/gui/gui_symbols.cc b/gui/gui_symbols.cc
index 303233c..f0cc1d2 100644
--- a/gui/gui_symbols.cc
+++ b/gui/gui_symbols.cc
@@ -19,6 +19,8 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <typeinfo>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/gui/settings_exdbm.cc b/gui/settings_exdbm.cc
index d5e3399..e2e3c3c 100644
--- a/gui/settings_exdbm.cc
+++ b/gui/settings_exdbm.cc
@@ -19,6 +19,7 @@ along with gpsim; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+#include <stdlib.h>
 #include "settings_exdbm.h"
 
 
diff --git a/modules/switch.cc b/modules/switch.cc
index 2f40394..3de822c 100644
--- a/modules/switch.cc
+++ b/modules/switch.cc
@@ -43,6 +43,7 @@ Boston, MA 02111-1307, USA.  */
 #include <assert.h>
 #include <string>
 #include <iostream>
+#include <typeinfo>
 #include <math.h>
 
 #include "../config.h"    // get the definition for HAVE_GUI
diff --git a/src/gpsim_object.cc b/src/gpsim_object.cc
index cdb2ae0..70503fc 100644
--- a/src/gpsim_object.cc
+++ b/src/gpsim_object.cc
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
 #include <typeinfo>
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #include "gpsim_object.h"
 
 //========================================================================
diff --git a/src/modules.cc b/src/modules.cc
index bef4f13..c564175 100644
--- a/src/modules.cc
+++ b/src/modules.cc
@@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
+#include <typeinfo>
+
 #include "modules.h"
 
 #include <stdio.h>
diff --git a/src/modules.h b/src/modules.h
index 8ba2e47..05a24db 100644
--- a/src/modules.h
+++ b/src/modules.h
@@ -37,6 +37,9 @@ Boston, MA 02111-1307, USA.  */
 #include <vector>
 #include <assert.h>
 
+#include <string.h>
+#include <stdlib.h>
+
 #include "gpsim_object.h"
 #include "gpsim_classes.h"
 
diff --git a/src/operator.cc b/src/operator.cc
index 945fcc0..ecc6b2a 100644
--- a/src/operator.cc
+++ b/src/operator.cc
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <typeinfo>
 
 #include "operator.h"
 #include "errors.h"
diff --git a/src/processor.cc b/src/processor.cc
index d73b3aa..504602c 100644
--- a/src/processor.cc
+++ b/src/processor.cc
@@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA.  */
 #include <iostream>
 #include <iomanip>
 #include <string>
+#include <typeinfo>
 
 #include "../config.h"
 #include "gpsim_def.h"
diff --git a/src/processor.h b/src/processor.h
index 9a67aad..2374c02 100644
--- a/src/processor.h
+++ b/src/processor.h
@@ -395,7 +395,7 @@ public:
   /// (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 --git a/src/program_files.cc b/src/program_files.cc
index 355406b..68c0187 100644
--- a/src/program_files.cc
+++ b/src/program_files.cc
@@ -1,3 +1,4 @@
+#include <cstring>
 #include "exports.h"
 #include "program_files.h"
 #include "pic-processor.h"
diff --git a/src/symbol.cc b/src/symbol.cc
index 1b7ea17..fb29d56 100644
--- a/src/symbol.cc
+++ b/src/symbol.cc
@@ -34,6 +34,7 @@ Boston, MA 02111-1307, USA.  */
 #include <string>
 #include <vector>
 #include <algorithm>
+#include <typeinfo>
 
 #include "../config.h"
 #include "14bit-processors.h"
diff --git a/src/value.cc b/src/value.cc
index 0cbfd51..5f5477f 100644
--- a/src/value.cc
+++ b/src/value.cc
@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA.  */
 #include <stdio.h>
 #include <iostream>
 #include <iomanip>
+#include <typeinfo>
 
 #include "processor.h"
 
diff --git a/src/value.h b/src/value.h
index 922365a..cb91063 100644
--- a/src/value.h
+++ b/src/value.h
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "gpsim_object.h"
 #include <glib.h>
+#include <string.h>
 
 class Processor;
 class Module;


Index: gpsim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gpsim/F-8/gpsim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gpsim.spec	27 Sep 2007 15:23:41 -0000	1.16
+++ gpsim.spec	9 Sep 2008 05:23:18 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		gpsim
 Version:	0.22.0
-Release:	5%{?dist}
+Release:	8%{?dist}
 Summary:	A simulator for Microchip (TM) PIC (TM) microcontrollers
 Summary(fr):	Un simulateur pour les microcontrôleurs PIC (TM) Microchip (TM)
 
@@ -8,9 +8,13 @@
 License:	GPLv2+
 URL:		http://www.dattalo.com/gnupic/gpsim.html
 Source:		http://dl.sf.net/gpsim/gpsim-%{version}.tar.gz
+Patch0:		%{name}-%{version}-gccfix.patch
+Patch1:         %{name}-%{version}-acinclude.patch
+
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk+extra-devel, flex, readline-devel, popt-devel
+BuildRequires:	autoconf
 
 %description
 gpsim is a simulator for Microchip (TM) PIC (TM) microcontrollers.
@@ -43,6 +47,9 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+autoconf
 
 %build
 %configure
@@ -80,6 +87,15 @@
 %{_includedir}/*
 
 %changelog
+* Mon Sep 08 2008 Roy Rankin <rrankin at ihug.com.au> - 0.22.0-8
+Patch for PPC build
+
+* Sun Sep 07 2008 Roy Rankin <rrankin at ihug.com.au> - 0.22.0-7
+Patch for gcc 4.3.0
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.22.0-6
+- Autorebuild for GCC 4.3
+
 * Thu Sep 27 2007 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.22.0-5
   - Add BR popt-devel
 


--- gpsim-0.21.11.happy_gcc DELETED ---


--- gpsim-0.21.11.ktechlab.patch DELETED ---




More information about the fedora-extras-commits mailing list