diff options
author | Kevin Lo <kevlo@FreeBSD.org> | 2000-11-21 04:51:25 +0000 |
---|---|---|
committer | Kevin Lo <kevlo@FreeBSD.org> | 2000-11-21 04:51:25 +0000 |
commit | 35eaf549b2b3696858cb51f72c1b71872b804600 (patch) | |
tree | 081bb5783d0fbb2241a0d1530c057faa4ee1fa48 /x11 | |
parent | Resign as a maintainer. (diff) |
- Fix Big5 encoding. Konqueror displays Chinese with no problems :)
- Fix tempnam() warnings
Notes
Notes:
svn path=/head/; revision=35297
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kdelibs2/files/patch-kcharsets.cpp | 41 | ||||
-rw-r--r-- | x11/kdelibs2/files/patch-midfile.cc | 34 |
2 files changed, 75 insertions, 0 deletions
diff --git a/x11/kdelibs2/files/patch-kcharsets.cpp b/x11/kdelibs2/files/patch-kcharsets.cpp new file mode 100644 index 000000000000..d54e999a1014 --- /dev/null +++ b/x11/kdelibs2/files/patch-kcharsets.cpp @@ -0,0 +1,41 @@ +--- kdecore/kcharsets.cpp.orig Mon Nov 20 16:41:35 2000 ++++ kdecore/kcharsets.cpp Mon Nov 20 16:44:34 2000 +@@ -66,7 +66,7 @@ + "set-gbk", + "set-zh", + "set-zh-tw", +- "set-big5", ++ "big5", + "tscii", + "utf-8", + "utf-16", +@@ -101,7 +101,7 @@ + "tis620.2533-1", + "gb2312.1980-0", + "gb2312.1980-0", +- "big5-0", ++ "cns11643.1986-*", + "big5-0", + "tscii-0", + "utf8", +@@ -136,8 +136,8 @@ + QFont::Set_Th_TH, + QFont::Set_GBK, + QFont::Set_Zh, +- QFont::Set_Big5, + QFont::Set_Zh_TW, ++ QFont::Set_Big5, + QFont::TSCII, + QFont::Unicode, + QFont::Unicode, +@@ -552,8 +552,9 @@ + case QFont::Set_Zh: + return "set-gbk"; + case QFont::Set_Zh_TW: ++ return "cns11643.1986-*"; + case QFont::Set_Big5: +- return "big5-0"; ++ return "big5"; + case QFont::AnyCharSet: + default: + break; diff --git a/x11/kdelibs2/files/patch-midfile.cc b/x11/kdelibs2/files/patch-midfile.cc new file mode 100644 index 000000000000..44fcd6f7d367 --- /dev/null +++ b/x11/kdelibs2/files/patch-midfile.cc @@ -0,0 +1,34 @@ +--- libkmid/midfile.cc.orig Tue Nov 21 10:21:43 2000 ++++ libkmid/midfile.cc Tue Nov 21 11:52:03 2000 +@@ -59,6 +59,23 @@ + { + fprintf(stderr,"ERROR : popen failed : %s\n",cmd); + } ++#ifdef HAVE_MKSTEMP ++ strcpy(tmpname,"/tmp/KMid.XXXXXXXX"); ++ int fd=mkstemps(tmpname); ++ if (fd<0) ++ { ++ pclose(infile); ++ delete cmd; ++ return 1; ++ } ++ FILE *outfile= fdopen(fd,"wb"); ++ if (outfile==NULL) ++ { ++ pclose(infile); ++ delete cmd; ++ return 1; ++ } ++#else + char *tmp=tempnam(NULL,"KMid"); + if (tmp==NULL) + { +@@ -74,6 +91,7 @@ + delete cmd; + return 1; + } ++#endif + int n=getc(infile); + if (n==EOF) + { |