Add some missing std namespace, to make this package compile

when using gcc 3.3.

5 files changed, 137 insertions, 1 deletions

diff --git a/devel/kdesdk2/distinfo b/devel/kdesdk2/distinfo
index 74e46471ae0..fba5a34c8d7 100644
--- a/devel/kdesdk2/distinfo
+++ b/devel/kdesdk2/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.6 2001/12/04 16:14:17 skrll Exp $
+$NetBSD: distinfo,v 1.7 2004/06/13 20:53:14 kristerw Exp $
 
 SHA1 (kdesdk-2.2.2.tar.bz2) = a4ae72be9d0f757d444c736a99499e844a940526
 Size (kdesdk-2.2.2.tar.bz2) = 1094197 bytes
 SHA1 (patch-aa) = 769ed077dedc4fef0c3fbcfaa34f2e8d9c282c00
 SHA1 (patch-ab) = 7de80906c1240bd92202609c09237639657bc712
 SHA1 (patch-ac) = fb2552d33ccd40f8c0830695187e093612b9b88f
+SHA1 (patch-ad) = 3d849304b40ba498439e664efd89d7c1cd8e511b
+SHA1 (patch-ae) = 963e67bbea576b3f13cebd1bf7369b27a924f36a
+SHA1 (patch-af) = b280d9a4b21d812fdba1b470e5eda2bdbefa6b27
+SHA1 (patch-ag) = e783aab05921e55142c4dd99b28f29f91e0f8920
diff --git a/devel/kdesdk2/patches/patch-ad b/devel/kdesdk2/patches/patch-ad
new file mode 100644
index 00000000000..63455058e39
--- /dev/null
+++ b/devel/kdesdk2/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/06/13 20:53:14 kristerw Exp $
+
+--- kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp.orig	2004-06-13 22:08:25.000000000 +0200
++++ kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp	2004-06-13 22:09:38.000000000 +0200
+@@ -776,7 +776,7 @@
+ 
+ bool KDBSearchEngine::startSingleSearch(QString searchString,
+ 				     unsigned int pattern1Limit=0,unsigned int pattern2Limit=0,
+-				     bool inTranslation=false)
++				     bool inTranslation)
+ {
+   /*
+     Check Ret 
diff --git a/devel/kdesdk2/patches/patch-ae b/devel/kdesdk2/patches/patch-ae
new file mode 100644
index 00000000000..87469f5c443
--- /dev/null
+++ b/devel/kdesdk2/patches/patch-ae
@@ -0,0 +1,64 @@
+$NetBSD: patch-ae,v 1.1 2004/06/13 20:53:14 kristerw Exp $
+
+--- poxml/GettextParser.cpp.orig	2004-06-13 22:23:29.000000000 +0200
++++ poxml/GettextParser.cpp	2004-06-13 22:25:16.000000000 +0200
+@@ -63,7 +63,7 @@
+ #line 64 "GettextParser.cpp"
+ #line 41 "gettext.g"
+ 	
+-	string c, mi, ms;
++	std::string c, mi, ms;
+ 	MsgBlock mb;
+ 	MsgList ml2;
+ 	
+@@ -141,14 +141,14 @@
+ 	return ml ;
+ }
+ 
+-string  GettextParser::comment() {
++std::string  GettextParser::comment() {
+ #line 62 "gettext.g"
+-	string s;
++	std::string s;
+ #line 148 "GettextParser.cpp"
+ 	ANTLR_USE_NAMESPACE(antlr)RefToken  c = ANTLR_USE_NAMESPACE(antlr)nullToken;
+ #line 62 "gettext.g"
+ 	
+-	string r;
++	std::string r;
+ 	
+ #line 154 "GettextParser.cpp"
+ 	
+@@ -190,7 +190,7 @@
+ #line 191 "GettextParser.cpp"
+ #line 51 "gettext.g"
+ 	
+-	string c, mi, ms;
++	std::string c, mi, ms;
+ 	
+ #line 196 "GettextParser.cpp"
+ 	
+@@ -220,9 +220,9 @@
+ 	return mb ;
+ }
+ 
+-string  GettextParser::msgid() {
++std::string  GettextParser::msgid() {
+ #line 70 "gettext.g"
+-	string s;
++	std::string s;
+ #line 227 "GettextParser.cpp"
+ 	ANTLR_USE_NAMESPACE(antlr)RefToken  t = ANTLR_USE_NAMESPACE(antlr)nullToken;
+ 	
+@@ -248,9 +248,9 @@
+ 	return s;
+ }
+ 
+-string  GettextParser::msgstr() {
++std::string  GettextParser::msgstr() {
+ #line 74 "gettext.g"
+-	string s;
++	std::string s;
+ #line 255 "GettextParser.cpp"
+ 	ANTLR_USE_NAMESPACE(antlr)RefToken  t = ANTLR_USE_NAMESPACE(antlr)nullToken;
+ 	
diff --git a/devel/kdesdk2/patches/patch-af b/devel/kdesdk2/patches/patch-af
new file mode 100644
index 00000000000..5f8694ad185
--- /dev/null
+++ b/devel/kdesdk2/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2004/06/13 20:53:14 kristerw Exp $
+
+--- poxml/GettextParser.hpp.orig	2004-06-13 22:15:31.000000000 +0200
++++ poxml/GettextParser.hpp	2004-06-13 22:23:06.000000000 +0200
+@@ -27,10 +27,10 @@
+ 	GettextParser(ANTLR_USE_NAMESPACE(antlr)TokenStream& lexer);
+ 	GettextParser(const ANTLR_USE_NAMESPACE(antlr)ParserSharedInputState& state);
+ 	public:  MsgList  file();
+-	public: string  comment();
++	public: std::string  comment();
+ 	public:  MsgBlock  file_block();
+-	public: string  msgid();
+-	public: string  msgstr();
++	public: std::string  msgid();
++	public: std::string  msgstr();
+ private:
+ 	static const char* _tokenNames[];
+ 	
diff --git a/devel/kdesdk2/patches/patch-ag b/devel/kdesdk2/patches/patch-ag
new file mode 100644
index 00000000000..f3ad7c363f0
--- /dev/null
+++ b/devel/kdesdk2/patches/patch-ag
@@ -0,0 +1,37 @@
+$NetBSD: patch-ag,v 1.1 2004/06/13 20:53:14 kristerw Exp $
+
+--- poxml/swappo.cpp.orig	2004-06-13 22:25:51.000000000 +0200
++++ poxml/swappo.cpp	2004-06-13 22:36:02.000000000 +0200
+@@ -1,5 +1,6 @@
+ #include "GettextParser.hpp"
+ #include <fstream>
++#include <iostream>
+ #include "GettextLexer.hpp"
+ 
+ int main(int argc, char **argv)
+@@ -12,13 +13,13 @@
+     MsgList translated;
+ 
+     try {
+-        ifstream s(argv[1]);
++        std::ifstream s(argv[1]);
+         GettextLexer lexer(s);
+         GettextParser parser(lexer);
+         translated = parser.file();
+ 
+-    } catch(exception& e) {
+-        cerr << "exception: " << e.what() << endl;
++    } catch(std::exception& e) {
++        std::cerr << "exception: " << e.what() << endl;
+         return 1;
+     }
+ 
+@@ -28,7 +29,7 @@
+         if ( !( *it ).msgstr.isEmpty() ) {
+             outputMsg("msgid", (*it).msgstr);
+             outputMsg("msgstr", (*it).msgid);
+-            cout << "\n";
++            std::cout << "\n";
+         }
+     }
+