rpms/starplot/devel starplot-0.95.4-gcc43.patch, NONE, 1.1 starplot.spec, 1.3, 1.4

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/starplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3187/devel

Modified Files:
	starplot.spec 
Added Files:
	starplot-0.95.4-gcc43.patch 
Log Message:
Adding missing includes to fix build with gcc-4.3

starplot-0.95.4-gcc43.patch:

--- NEW FILE starplot-0.95.4-gcc43.patch ---
The STL headers in gcc-4.3 have been cleaned up, so that the headers don't drag in
unnecessary dependencies which aren't requested by the standard.
This fixes build for gcc-4.3

Lubomir Kundrak <lkundrak at redhat.com>

diff -urp starplot-0.95.4.orig/src/gui/filedialogs.cc starplot-0.95.4/src/gui/filedialogs.cc
--- starplot-0.95.4.orig/src/gui/filedialogs.cc	2007-02-03 00:39:01.000000000 +0100
+++ starplot-0.95.4/src/gui/filedialogs.cc	2008-01-03 22:33:58.000000000 +0100
@@ -24,6 +24,7 @@
 
 #include <gtk/gtk.h>
 #include "starplot.h"
+#include <cstring>
 
 using std::endl;
 using std::string;
diff -urp starplot-0.95.4.orig/src/gui/menuops.cc starplot-0.95.4/src/gui/menuops.cc
--- starplot-0.95.4.orig/src/gui/menuops.cc	2007-02-03 00:23:26.000000000 +0100
+++ starplot-0.95.4/src/gui/menuops.cc	2008-01-03 21:41:45.000000000 +0100
@@ -535,7 +535,7 @@ void openurl(char * url)
   }
 
   char * temp = new char[globals::program_help_browser.size() + 1];
-  std::strcpy(temp, globals::program_help_browser.c_str());
+  strcpy(temp, globals::program_help_browser.c_str());
   char * const command[3] = { temp, url, NULL };
 
   pid = fork();


Index: starplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/starplot/devel/starplot.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- starplot.spec	25 Nov 2007 14:31:05 -0000	1.3
+++ starplot.spec	3 Jan 2008 21:41:01 -0000	1.4
@@ -7,14 +7,15 @@
 Summary:	3-dimensional perspective star map viewer
 Name:		starplot
 Version:	0.95.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://starplot.org/
 Source0:	http://starplot.org/downloads/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 
-Patch0:		%{name}-%{version}-docdir.patch
+Patch0:		starplot-0.95.4-docdir.patch
+Patch1:		starplot-0.95.4-gcc43.patch
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -32,6 +33,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Suppress rpmlint error.
 iconv --from-code ISO8859-1 --to-code UTF-8 ./doc/examples/example.spec \
@@ -88,6 +90,10 @@
 %{_datadir}/%{name}/test.stars
 
 %changelog
+* Thu Jan 03 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.95.4-4
+- Corrected Patch0 name
+- Adding missing includes to fix build with gcc-4.3
+
 * Sat Nov 24 2007 Debarshi Ray <rishi at fedoraproject.org> - 0.95.4-3
 - Added 'BuildRequires: gettext'.
 - Removed Encoding from Desktop Entry for all distributions, except Fedora 7.