Make this build with latest gcc (3.x), using proper namespaces.

3 files changed, 28 insertions, 1 deletions

diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo
index 74f87b55f49..8d38df668f4 100644
--- a/print/cjk-lyx/distinfo
+++ b/print/cjk-lyx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/01/13 15:49:17 jschauma Exp $
+$NetBSD: distinfo,v 1.4 2004/11/18 00:14:04 hubertf Exp $
 
 SHA1 (lyx-1.2.0.tar.gz) = 56db850f316c18e00c4b10946216b6eb25107dab
 Size (lyx-1.2.0.tar.gz) = 6418424 bytes
@@ -11,3 +11,5 @@ SHA1 (patch-ad) = 48cb4ee6bfee21ee981db52d20e34c8e23316928
 SHA1 (patch-ae) = 5b744b75ac59a4f47fd3d02fe0a4b9ce551a39b7
 SHA1 (patch-af) = f09bdf2b9e8da14e9b58b683ab40e89775344ec3
 SHA1 (patch-ag) = b1f3e8e12d667f2761206bcd4d9d0d5c450fac09
+SHA1 (patch-ah) = 100b2b3d4f823a472e7c69dbd3130c830a1a6cba
+SHA1 (patch-ai) = 3e694cf156a527bba9155de49c3a6a9fb66af014
diff --git a/print/cjk-lyx/patches/patch-ah b/print/cjk-lyx/patches/patch-ah
new file mode 100644
index 00000000000..fcf709928a2
--- /dev/null
+++ b/print/cjk-lyx/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2004/11/18 00:14:04 hubertf Exp $
+
+--- src/lyxcodeconv.h.orig	2004-11-17 19:56:50.000000000 +0000
++++ src/lyxcodeconv.h
+@@ -14,6 +14,7 @@ using std::ifstream;
+ using std::fstream;
+ using std::ios;
+ using std::setw;
++using namespace std;
+ 
+ #include "support/lyxstring.h"
+ #include "LString.h"
diff --git a/print/cjk-lyx/patches/patch-ai b/print/cjk-lyx/patches/patch-ai
new file mode 100644
index 00000000000..c28270d0c2f
--- /dev/null
+++ b/print/cjk-lyx/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2004/11/18 00:14:04 hubertf Exp $
+
+--- src/lyxim.C.orig	2004-11-17 20:11:34.000000000 +0000
++++ src/lyxim.C
+@@ -17,6 +17,8 @@
+ #include "WorkArea.h"
+ #include "BufferView_pimpl.h"
+ 
++using namespace std;
++
+ #define DUMMY_FONT_NAME       "-*-*-*-R-Normal--14-130-75-75-*-*"
+ 
+ //extern FD_form_main *fd_form_main;