rpms/wordtrans/devel wordtrans-1.1pre13-gcc34-1.patch, NONE, 1.1 wordtrans.spec, 1.33, 1.34

[Than Ngo (than)]

Author: than

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

Modified Files:
	wordtrans.spec 
Added Files:
	wordtrans-1.1pre13-gcc34-1.patch 
Log Message:
rebuild against gcc 4.3


wordtrans-1.1pre13-gcc34-1.patch:

--- NEW FILE wordtrans-1.1pre13-gcc34-1.patch ---
diff -up wordtrans-1.1pre13/src/libbab/libbab.cc.gcc wordtrans-1.1pre13/src/libbab/libbab.cc
--- wordtrans-1.1pre13/src/libbab/libbab.cc.gcc	2008-02-16 10:41:59.000000000 +0100
+++ wordtrans-1.1pre13/src/libbab/libbab.cc	2008-02-16 10:44:37.000000000 +0100
@@ -30,6 +30,7 @@
 #include <list>
 #include <cctype>
 #include <cerrno>
+#include <cstring>
 
 #ifdef HONOR_STD
 using std::istream ;
diff -up wordtrans-1.1pre13/src/libbab/hebrew.cc.gcc wordtrans-1.1pre13/src/libbab/hebrew.cc
--- wordtrans-1.1pre13/src/libbab/hebrew.cc.gcc	2008-02-16 10:44:43.000000000 +0100
+++ wordtrans-1.1pre13/src/libbab/hebrew.cc	2008-02-16 10:45:01.000000000 +0100
@@ -3,6 +3,7 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <iostream>
 #include <iomanip>
 #include <fstream>
diff -up wordtrans-1.1pre13/src/SimpleConfig.cpp.gcc wordtrans-1.1pre13/src/SimpleConfig.cpp
diff -up wordtrans-1.1pre13/src/no-gui.cpp.gcc wordtrans-1.1pre13/src/no-gui.cpp
--- wordtrans-1.1pre13/src/no-gui.cpp.gcc	2008-02-16 19:23:10.000000000 +0100
+++ wordtrans-1.1pre13/src/no-gui.cpp	2008-02-16 19:24:04.000000000 +0100
@@ -27,6 +27,7 @@
 #include "salidas.h"
 #include <qtextcodec.h>
 #include "version.h"
+#include <cstring>
 
 #define BUSCAR 1
 #define SHOW_DESC 2
diff -up wordtrans-1.1pre13/src/qconfig/appconf.cpp.gcc wordtrans-1.1pre13/src/qconfig/appconf.cpp
--- wordtrans-1.1pre13/src/qconfig/appconf.cpp.gcc	2008-02-16 19:24:35.000000000 +0100
+++ wordtrans-1.1pre13/src/qconfig/appconf.cpp	2008-02-16 19:31:06.000000000 +0100
@@ -71,8 +71,9 @@
 
 #include  <fcntl.h>
 #include  <sys/types.h>
-#include  <iostream.h>
-#include  <fstream.h>
+#include  <iostream>
+#include  <fstream>
+#include  <cstring>
 #include  <string.h>
 #include  <ctype.h>
 #include  <stdio.h>
@@ -109,6 +110,12 @@
 #endif
 
 using std::strcpy;
+using std::endl;
+using std::ifstream;
+using std::ios;
+using std::istream;
+using std::ostream;
+using std::fstream;
 
 // logs an error message (with a name like that it's really strange)
 // message length is limited to 1Kb
diff -up wordtrans-1.1pre13/src/qconfig/SimpleConfig.cpp.gcc wordtrans-1.1pre13/src/qconfig/SimpleConfig.cpp
--- wordtrans-1.1pre13/src/qconfig/SimpleConfig.cpp.gcc	2008-02-16 19:34:00.000000000 +0100
+++ wordtrans-1.1pre13/src/qconfig/SimpleConfig.cpp	2008-02-16 19:34:20.000000000 +0100
@@ -3,13 +3,14 @@
 #include <SimpleConfig.h>
 
 #include <stdlib.h>
-#include <fstream.h>
+#include <fstream>
 #include <cstring> //Soluciona el bug #113819 de Debian
 
 #include "../salidas.h" //¡Añade dependencia a un fichero externo!
 
 using std::strcpy;
 using std::strcmp;
+using std::ofstream;
 
 SimpleConfig::SimpleConfig() : FileConfig() {
 	strcpy(filename,"");


Index: wordtrans.spec
===================================================================
RCS file: /cvs/extras/rpms/wordtrans/devel/wordtrans.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- wordtrans.spec	15 Feb 2008 22:25:54 -0000	1.33
+++ wordtrans.spec	16 Feb 2008 19:53:17 -0000	1.34
@@ -10,7 +10,7 @@
 URL: http://wordtrans.sourceforge.net
 Summary: Multi Language Word Translator for Linux
 Version: 1.1
-Release: 0.4.pre13%{?dist}
+Release: 0.5.pre13%{?dist}
 Epoch: 1
 License: GPL
 Source: http://wordtrans.sourceforge.net/%{name}_%{iversion}.tar.gz
@@ -40,6 +40,7 @@
 Patch9: wordtrans-1.1pre13-utf8.patch
 Patch10: wordtrans-1.1pre13-gcc34.patch
 Patch11: wordtrans-1.1pre13-kcmdlineargs.patch
+Patch12: wordtrans-1.1pre13-gcc34-1.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -113,6 +114,7 @@
 %patch9 -p1 -b .utf8
 %patch10 -p1 -b .gcc34
 %patch11 -p1 -b .kcmdlineargs
+%patch12 -p1 -b .gcc34-1
 
 %build
 QTDIR="" && source /etc/profile.d/qt.sh
@@ -278,6 +280,9 @@
 /var/www/wordtrans
 
 %changelog
+* Sat Feb 16 2008 Than Ngo <than at redhat.com> 1.1-0.5.pre13
+- rebuilt against gcc 4.3
+
 * Fri Feb 15 2008 Than Ngo <than at redhat.com> 1.1-0.4.pre13
 - rebuilt