mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-30 21:49:25 +00:00
a29b482458
default -j2 (but keep MAKE_JOBS var), restore old perl REs as soon as I'd learned how to do multiple ones, remove QPL license file from packaging, sync with newest KOI8-U/R stuff (not tested). The biggest bonus: split QT Designer into its own port, and make the qt22/qt-designer pair a member of the master-slave ports legion, hopefully to reduce redundancy as much as possible. This should also save roughly 20 minutes of compile time on a dual PIII-600 for those that don't need or want QT Designer. UIC is, however, still installed/compiled by the default Qt 2.2.4 (as it _is_ required for other things e.g. KDE2). USE_MESA may break KDE2. Hopefully, now that the port does install both the threaded and non-threaded versions of QT, it won't. But until the next release of KDE2, I'm not gonna bother testing to see. USE_MESA repeatedly requested by: sobomax
45 lines
1.8 KiB
Plaintext
45 lines
1.8 KiB
Plaintext
--- src/kernel/qfont_x11.cpp Wed Jan 31 21:26:40 2001
|
|
+++ src/kernel/qfont_x11.cpp.new Sat Feb 3 16:22:47 2001
|
|
@@ -324,6 +324,9 @@
|
|
{ "ISO 8859-14", QFont::ISO_8859_14 },
|
|
{ "ISO 8859-15", QFont::ISO_8859_15 },
|
|
{ "KOI8-R", QFont::KOI8R },
|
|
+ { "KOI8-U", QFont::KOI8U },
|
|
+ { "CP 1251", QFont::CP_1251 },
|
|
+ { "PT 154", QFont::PT_154 },
|
|
{ "eucJP", QFont::Set_Ja },
|
|
{ "SJIS", QFont::Set_Ja },
|
|
{ "JIS7", QFont::Set_Ja },
|
|
@@ -522,6 +525,12 @@
|
|
} else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
|
|
strcmp( tokens[CharsetEncoding], "u" ) == 0) {
|
|
fd->charSet = QFont::KOI8U;
|
|
+ } else if( qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
|
|
+ (qstrcmp( tokens[CharsetEncoding], "1251" ) == 0 ) ) {
|
|
+ fd->charSet = QFont::CP_1251;
|
|
+ } else if( qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
|
|
+ (qstrcmp( tokens[CharsetEncoding], "154" ) == 0 ) ) {
|
|
+ fd->charSet = QFont::PT_154;
|
|
} else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 &&
|
|
qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) {
|
|
fd->charSet = QFont::TSCII;
|
|
@@ -1435,6 +1444,18 @@
|
|
score |= CharSetScore;
|
|
else
|
|
exactMatch = FALSE;
|
|
+ } else if ( charSet() == CP_1251 ) {
|
|
+ if (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 ||
|
|
+ qstrcmp( tokens[CharsetEncoding], "1251" ) == 0)
|
|
+ score |= CharSetScore;
|
|
+ else
|
|
+ exactMatch = FALSE;
|
|
+ } else if ( charSet() == PT_154 ) {
|
|
+ if (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 ||
|
|
+ qstrcmp( tokens[CharsetEncoding], "154" ) == 0)
|
|
+ score |= CharSetScore;
|
|
+ else
|
|
+ exactMatch = FALSE;
|
|
} else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 &&
|
|
charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) {
|
|
int i = 0;
|