rpms/subcommander/devel subcommander-1.2.2-gcc43.patch, NONE, 1.1 subcommander.spec, 1.6, 1.7

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/subcommander/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26685

Modified Files:
	subcommander.spec 
Added Files:
	subcommander-1.2.2-gcc43.patch 
Log Message:
Fix gcc-4.3 issues

subcommander-1.2.2-gcc43.patch:

--- NEW FILE subcommander-1.2.2-gcc43.patch ---
diff -up subcommander-1.2.2/submerge/LineTokenizer.cpp.gcc43 subcommander-1.2.2/submerge/LineTokenizer.cpp
--- subcommander-1.2.2/submerge/LineTokenizer.cpp.gcc43	2006-11-18 15:53:17.000000000 +0100
+++ subcommander-1.2.2/submerge/LineTokenizer.cpp	2008-01-21 19:33:44.000000000 +0100
@@ -14,6 +14,7 @@
 //#include <sstream>
 #include <strstream>
 
+#include <cstring>
 
 LineTokenizer::LineTokenizer( const unsigned char* buf, size_t size )
 : _buf(buf), _size(size)
diff -up subcommander-1.2.2/sublib/MsgHandler.cpp.gcc43 subcommander-1.2.2/sublib/MsgHandler.cpp
--- subcommander-1.2.2/sublib/MsgHandler.cpp.gcc43	2006-09-14 23:10:12.000000000 +0200
+++ subcommander-1.2.2/sublib/MsgHandler.cpp	2008-01-21 19:35:24.000000000 +0100
@@ -13,6 +13,9 @@
 #include "MessageBox.h"
 #include "Utility.h"
 
+#include <cstring>
+#include <cstdlib>
+
 // qt
 #include <qapplication.h>
 
diff -up subcommander-1.2.2/sublib/Utility.cpp.gcc43 subcommander-1.2.2/sublib/Utility.cpp
--- subcommander-1.2.2/sublib/Utility.cpp.gcc43	2006-11-12 12:01:51.000000000 +0100
+++ subcommander-1.2.2/sublib/Utility.cpp	2008-01-21 19:33:44.000000000 +0100
@@ -13,6 +13,7 @@
 #ifdef _WIN32
 #include "win32st/Stacktrace.h"
 #endif // _WIN32
+#include <cstdlib>
  
 // qt
 #include <qapplication.h>


Index: subcommander.spec
===================================================================
RCS file: /cvs/extras/rpms/subcommander/devel/subcommander.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- subcommander.spec	16 Dec 2007 19:38:11 -0000	1.6
+++ subcommander.spec	21 Jan 2008 19:06:33 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		subcommander
 Version:	1.2.2
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	Graphical UI for subversion
 
 Group:		Development/Tools
@@ -9,6 +9,7 @@
 Source0:	http://subcommander.tigris.org/files/documents/1759/35437/Subcommander-%{version}.tar.gz
 Source1:	subcommander.desktop
 Source2:	submerge.desktop
+Patch1:		subcommander-1.2.2-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	subversion-devel >= 1.4.2
@@ -30,6 +31,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .gcc43
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -68,6 +70,9 @@
 %doc README CHANGES COPYING
 
 %changelog
+* Mon Jan 21 2008 Jochen Schmitt <Jochen herr-schmitt de> 1.2.2-10
+- Fix gcc-4.3 issues
+
 * Sun Dec 16 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.2.2-9
 - Rebuild (#425779)