diff options
author | Will Andrews <will@FreeBSD.org> | 2001-02-26 19:24:49 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2001-02-26 19:24:49 +0000 |
commit | 26121d15aefe3055f4b11633dcaca64da67c0913 (patch) | |
tree | 6ef2924bd6e9cb5e5a689c5d3a30612f8ec5dc50 /x11/kdelibs2/files/patch-kcharsets.cpp | |
parent | Remove '-lc' from LDLIBS so threaded apps can link against libslang (diff) |
Lo and behold, welcome KDE 2.1 to our ports tree. As a direct result of
the KDE team's excellent work, I am initiating burn sequence for KDE
1.x. All base KDE1 ports are hereby nuked. I am also reluctantly
reassuming maintainership of the KDE2 ports. Official KDE 2.1 packages
built for FreeBSD 4.2-STABLE w/ XFree86 4.0.2 are available on KDE's
official ftp mirrors now. Enjoy!
Note: It seems that the KDE people rerolled their kdelibs and kdebase
packages, and a quick examination of diffs reveal minor changes, but the
port should still work. I'll fix the packaging problems that bento runs
into.
Approved by: kevlo
Diffstat (limited to 'x11/kdelibs2/files/patch-kcharsets.cpp')
-rw-r--r-- | x11/kdelibs2/files/patch-kcharsets.cpp | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/x11/kdelibs2/files/patch-kcharsets.cpp b/x11/kdelibs2/files/patch-kcharsets.cpp deleted file mode 100644 index c104c830da46..000000000000 --- a/x11/kdelibs2/files/patch-kcharsets.cpp +++ /dev/null @@ -1,90 +0,0 @@ -diff -ur kdecore/kcharsets.cpp kdecore/kcharsets.cpp ---- kdecore/kcharsets.cpp Tue Oct 24 19:57:36 2000 -+++ kdecore/kcharsets.cpp Tue Oct 24 20:10:19 2000 -@@ -37,9 +37,9 @@ - template class QList<QFont::CharSet>; - - #if QT_VERSION > 220 --#define CHARSETS_COUNT 30 -+#define CHARSETS_COUNT 32 - #else --#define CHARSETS_COUNT 29 -+#define CHARSETS_COUNT 32 - #endif - - static const char * const charsetsStr[CHARSETS_COUNT] = { -@@ -60,6 +60,9 @@ - "iso-8859-14", - "iso-8859-15", - "koi8r", -+ "koi8u", -+ "cp1251", -+ "pt154", - "eucjp", - "euckr", - "set-th-th", -@@ -71,9 +74,6 @@ - "utf-8", - "utf-16", - "iso-8859-11", --#if QT_VERSION > 220 -- "koi8u", --#endif - "Any" - }; - -@@ -96,6 +96,9 @@ - "iso8859-14", - "iso8859-15", - "koi8-r", -+ "koi8-u", -+ "microsoft-cp1251", -+ "paratype-cp154", - "jisx0208.1983-0", - "ksc5601.1987-0", - "tis620.2533-1", -@@ -107,9 +110,6 @@ - "utf8", - "utf16", - "tis620-*", --#if QT_VERSION > 220 -- "koi8-u", --#endif - "" // this will always return true... - }; - -@@ -131,6 +131,9 @@ - QFont::ISO_8859_14, - QFont::ISO_8859_15, - QFont::KOI8R, -+ QFont::KOI8U, -+ QFont::CP_1251, -+ QFont::PT_154, - QFont::Set_Ja, - QFont::Set_Ko, - QFont::Set_Th_TH, -@@ -142,9 +145,6 @@ - QFont::Unicode, - QFont::Unicode, - QFont::ISO_8859_11, --#if QT_VERSION > 220 -- QFont::KOI8U, --#endif - QFont::AnyCharSet - }; - -@@ -536,10 +536,12 @@ - return "iso8859-15"; - case QFont::KOI8R: - return "koi8-r"; --#if QT_VERSION > 220 - case QFont::KOI8U: - return "koi8-u"; --#endif -+ case QFont::CP_1251: -+ return "microsoft-cp1251"; -+ case QFont::PT_154: -+ return "paratype-cp154"; - case QFont::Set_Ko: - return "ksc5601.1987-0"; - case QFont::Set_Ja: |