Update QT2 to 2.2.4: Re-add USE_MESA, remove antialiasing patch, remove

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

1 files changed, 14 insertions, 30 deletions

diff --git a/x11-toolkits/qt23/files/patch-an b/x11-toolkits/qt23/files/patch-an
index 74b1d0c..b3a5f30 100644
--- a/x11-toolkits/qt23/files/patch-an
+++ b/x11-toolkits/qt23/files/patch-an
@@ -1,6 +1,5 @@
-diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp
---- src/kernel/qfont_x11.cpp	Wed Oct  4 13:48:48 2000
-+++ src/kernel/qfont_x11.cpp	Mon Oct  9 11:59:36 2000
+--- 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 },
@@ -11,15 +10,7 @@ diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp
      { "eucJP", QFont::Set_Ja },
      { "SJIS", QFont::Set_Ja },
      { "JIS7", QFont::Set_Ja },
-@@ -337,7 +340,6 @@
-     { "Big5", QFont::Set_Big5 },
-     { "ta_TA.TSCII", QFont::TSCII },
-     { "TSCII", QFont::TSCII },
--    { "KOI8-U", QFont::KOI8U },
-     { 0, /* anything */ QFont::ISO_8859_1 }
- };
- 
-@@ -513,6 +515,12 @@
+@@ -522,6 +525,12 @@
      } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
  	       strcmp( tokens[CharsetEncoding], "u" ) == 0) {
  	fd->charSet = QFont::KOI8U;
@@ -32,29 +23,22 @@ diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp
      } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 &&
  	       qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) {
  	fd->charSet = QFont::TSCII;
-@@ -1424,11 +1432,23 @@
-        else
- 	       exactMatch = FALSE;
-     } else if ( charSet() == KOI8U ) {
--       if ( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
--	    strcmp( tokens[CharsetEncoding], "u" ) == 0 )
-+       if ( qstrcmp( tokens[CharsetRegistry], "koi8" ) == 0 &&
-+	    qstrcmp( tokens[CharsetEncoding], "u" ) == 0 )
+@@ -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;
++	    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;
++	    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;