rpms/ds9/devel ds9-gcc43.patch,1.1,1.2 ds9.spec,1.9,1.10
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Thu Feb 21 17:31:03 UTC 2008
Author: sergiopr
Update of /cvs/pkgs/rpms/ds9/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22476
Modified Files:
ds9-gcc43.patch ds9.spec
Log Message:
* Thu Feb 21 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.1-4
- Patch to build with gcc 4.3 updated
ds9-gcc43.patch:
Index: ds9-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ds9-gcc43.patch 21 Feb 2008 10:09:51 -0000 1.1
+++ ds9-gcc43.patch 21 Feb 2008 17:30:59 -0000 1.2
@@ -1,3 +1,12 @@
+diff -ur saods9/ds9/ds9.C saods9.gcc43/ds9/ds9.C
+--- saods9/ds9/ds9.C 2007-06-19 19:13:04.000000000 +0200
++++ saods9.gcc43/ds9/ds9.C 2008-02-21 15:45:02.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <iostream>
++#include <cstring>
+ using namespace std;
+
+ #include <tcl.h>
diff -ur saods9/iis/iistcl.C saods9.gcc43/iis/iistcl.C
--- saods9/iis/iistcl.C 2008-01-04 18:24:23.000000000 +0100
+++ saods9.gcc43/iis/iistcl.C 2008-02-21 11:03:11.000000000 +0100
@@ -9,6 +18,122 @@
using namespace std;
#include <tcl.h>
+diff -ur saods9/saotk/fitsy++/card.C saods9.gcc43/saotk/fitsy++/card.C
+--- saods9/saotk/fitsy++/card.C 2008-01-04 18:29:24.000000000 +0100
++++ saods9.gcc43/saotk/fitsy++/card.C 2008-02-21 12:37:49.000000000 +0100
+@@ -3,6 +3,7 @@
+ // For conditions of distribution and use, see copyright notice in "copyright"
+
+ #include "card.h"
++#include <string.h>
+
+ FitsCard::FitsCard()
+ {
+diff -ur saods9/saotk/fitsy++/compress.C saods9.gcc43/saotk/fitsy++/compress.C
+--- saods9/saotk/fitsy++/compress.C 2008-01-04 18:29:24.000000000 +0100
++++ saods9.gcc43/saotk/fitsy++/compress.C 2008-02-21 12:37:22.000000000 +0100
+@@ -6,6 +6,7 @@
+ #include "head.h"
+ #include "util.h"
+ #include "NaN.h"
++#include <string.h>
+
+ FitsCompress::FitsCompress(FitsFile* fits)
+ {
+diff -ur saods9/saotk/fitsy++/file.C saods9.gcc43/saotk/fitsy++/file.C
+--- saods9/saotk/fitsy++/file.C 2008-01-04 18:29:24.000000000 +0100
++++ saods9.gcc43/saotk/fitsy++/file.C 2008-02-21 12:37:05.000000000 +0100
+@@ -6,6 +6,7 @@
+ #include <sstream>
+ #include <iomanip>
+ using namespace std;
++#include <string.h>
+
+ #include "file.h"
+ #include "util.h"
+diff -ur saods9/saotk/fitsy++/iis.C saods9.gcc43/saotk/fitsy++/iis.C
+--- saods9/saotk/fitsy++/iis.C 2008-01-04 18:29:24.000000000 +0100
++++ saods9.gcc43/saotk/fitsy++/iis.C 2008-02-21 12:36:22.000000000 +0100
+@@ -3,6 +3,7 @@
+ // For conditions of distribution and use, see copyright notice in "copyright"
+
+ #include "iis.h"
++#include <string.h>
+
+ FitsIIS::FitsIIS(int width, int height)
+ {
+diff -ur saods9/saotk/frame/callback.C saods9.gcc43/saotk/frame/callback.C
+--- saods9/saotk/frame/callback.C 2008-01-04 18:29:25.000000000 +0100
++++ saods9.gcc43/saotk/frame/callback.C 2008-02-21 14:59:05.000000000 +0100
+@@ -3,7 +3,7 @@
+ // For conditions of distribution and use, see copyright notice in "copyright"
+
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "callback.h"
+
+diff -ur saods9/saotk/frame/ciaoparser.C saods9.gcc43/saotk/frame/ciaoparser.C
+--- saods9/saotk/frame/ciaoparser.C 2007-12-06 23:37:37.000000000 +0100
++++ saods9.gcc43/saotk/frame/ciaoparser.C 2008-02-21 15:06:08.000000000 +0100
+@@ -132,7 +132,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/frame/ciaoparser.Y saods9.gcc43/saotk/frame/ciaoparser.Y
+--- saods9/saotk/frame/ciaoparser.Y 2008-01-04 18:44:34.000000000 +0100
++++ saods9.gcc43/saotk/frame/ciaoparser.Y 2008-02-21 15:05:31.000000000 +0100
+@@ -14,7 +14,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/frame/ds9parser.C saods9.gcc43/saotk/frame/ds9parser.C
+--- saods9/saotk/frame/ds9parser.C 2007-12-06 23:37:38.000000000 +0100
++++ saods9.gcc43/saotk/frame/ds9parser.C 2008-02-21 15:06:55.000000000 +0100
+@@ -333,7 +333,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/frame/ds9parser.Y saods9.gcc43/saotk/frame/ds9parser.Y
+--- saods9/saotk/frame/ds9parser.Y 2008-01-04 18:44:34.000000000 +0100
++++ saods9.gcc43/saotk/frame/ds9parser.Y 2008-02-21 15:06:42.000000000 +0100
+@@ -15,7 +15,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/frame/fitsdata.C saods9.gcc43/saotk/frame/fitsdata.C
+--- saods9/saotk/frame/fitsdata.C 2008-01-04 18:29:25.000000000 +0100
++++ saods9.gcc43/saotk/frame/fitsdata.C 2008-02-21 15:07:07.000000000 +0100
+@@ -5,7 +5,7 @@
+ #include <stdlib.h>
+ #include <limits.h>
+ #include <float.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+
+ #include "fitsdata.h"
diff -ur saods9/saotk/frame/frscale.C saods9.gcc43/saotk/frame/frscale.C
--- saods9/saotk/frame/frscale.C 2008-01-04 18:29:26.000000000 +0100
+++ saods9.gcc43/saotk/frame/frscale.C 2008-02-21 11:06:29.000000000 +0100
@@ -20,3 +145,147 @@
#include "frscale.h"
+diff -ur saods9/saotk/frame/inversescale.C saods9.gcc43/saotk/frame/inversescale.C
+--- saods9/saotk/frame/inversescale.C 2008-01-04 18:29:26.000000000 +0100
++++ saods9.gcc43/saotk/frame/inversescale.C 2008-02-21 15:06:21.000000000 +0100
+@@ -2,7 +2,7 @@
+ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA
+ // For conditions of distribution and use, see copyright notice in "copyright"
+
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+
+ #include "inversescale.h"
+diff -ur saods9/saotk/frame/parser.C saods9.gcc43/saotk/frame/parser.C
+--- saods9/saotk/frame/parser.C 2007-12-06 23:37:38.000000000 +0100
++++ saods9.gcc43/saotk/frame/parser.C 2008-02-21 15:06:30.000000000 +0100
+@@ -702,7 +702,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "frame.h"
+diff -ur saods9/saotk/frame/parser.Y saods9.gcc43/saotk/frame/parser.Y
+--- saods9/saotk/frame/parser.Y 2008-01-04 18:44:34.000000000 +0100
++++ saods9.gcc43/saotk/frame/parser.Y 2008-02-21 15:07:00.000000000 +0100
+@@ -14,7 +14,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "frame.h"
+diff -ur saods9/saotk/frame/prosparser.C saods9.gcc43/saotk/frame/prosparser.C
+--- saods9/saotk/frame/prosparser.C 2007-12-06 23:37:43.000000000 +0100
++++ saods9.gcc43/saotk/frame/prosparser.C 2008-02-21 15:05:22.000000000 +0100
+@@ -153,7 +153,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/frame/prosparser.Y saods9.gcc43/saotk/frame/prosparser.Y
+--- saods9/saotk/frame/prosparser.Y 2008-01-04 18:44:34.000000000 +0100
++++ saods9.gcc43/saotk/frame/prosparser.Y 2008-02-21 15:06:50.000000000 +0100
+@@ -15,7 +15,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/frame/saoparser.C saods9.gcc43/saotk/frame/saoparser.C
+--- saods9/saotk/frame/saoparser.C 2007-12-06 23:37:43.000000000 +0100
++++ saods9.gcc43/saotk/frame/saoparser.C 2008-02-21 15:06:15.000000000 +0100
+@@ -123,7 +123,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/frame/saoparser.Y saods9.gcc43/saotk/frame/saoparser.Y
+--- saods9/saotk/frame/saoparser.Y 2008-01-04 18:44:34.000000000 +0100
++++ saods9.gcc43/saotk/frame/saoparser.Y 2008-02-21 15:07:51.000000000 +0100
+@@ -15,7 +15,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/frame/tngparser.C saods9.gcc43/saotk/frame/tngparser.C
+--- saods9/saotk/frame/tngparser.C 2007-12-06 23:37:43.000000000 +0100
++++ saods9.gcc43/saotk/frame/tngparser.C 2008-02-21 15:05:55.000000000 +0100
+@@ -169,7 +169,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/frame/tngparser.Y saods9.gcc43/saotk/frame/tngparser.Y
+--- saods9/saotk/frame/tngparser.Y 2008-01-04 18:44:34.000000000 +0100
++++ saods9.gcc43/saotk/frame/tngparser.Y 2008-02-21 15:06:37.000000000 +0100
+@@ -15,7 +15,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/frame/xyparser.C saods9.gcc43/saotk/frame/xyparser.C
+--- saods9/saotk/frame/xyparser.C 2007-12-06 23:37:43.000000000 +0100
++++ saods9.gcc43/saotk/frame/xyparser.C 2008-02-21 15:07:44.000000000 +0100
+@@ -198,7 +198,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/frame/xyparser.Y saods9.gcc43/saotk/frame/xyparser.Y
+--- saods9/saotk/frame/xyparser.Y 2008-01-04 18:44:34.000000000 +0100
++++ saods9.gcc43/saotk/frame/xyparser.Y 2008-02-21 15:07:34.000000000 +0100
+@@ -14,7 +14,7 @@
+
+ #include <math.h>
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "framebase.h"
+ #include "fitsimage.h"
+diff -ur saods9/saotk/widget/ps.C saods9.gcc43/saotk/widget/ps.C
+--- saods9/saotk/widget/ps.C 2008-01-04 18:29:27.000000000 +0100
++++ saods9.gcc43/saotk/widget/ps.C 2008-02-21 12:34:38.000000000 +0100
+@@ -4,6 +4,8 @@
+
+ #include "ps.h"
+ #include "util.h"
++#include <cstring>
++using std::memcpy;
+
+ Filter::Filter()
+ {
Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ds9.spec 21 Feb 2008 10:09:51 -0000 1.9
+++ ds9.spec 21 Feb 2008 17:30:59 -0000 1.10
@@ -1,6 +1,6 @@
Name: ds9
Version: 5.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Astronomical Data Visualization Application
Group: Applications/Engineering
@@ -92,6 +92,9 @@
%changelog
+* Thu Feb 21 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.1-4
+- Patch to build with gcc 4.3 updated
+
* Thu Feb 21 2008 Sergio Pascual <sergiopr at fedoraproject.org> - 5.1-3
- Patch to build with gcc 4.3
More information about the fedora-extras-commits
mailing list