diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2005-03-01 14:08:09 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2005-03-01 14:08:09 +0000 |
| commit | 561ee73240bd7d14dd20a0bca82daae5fe1346c5 (patch) | |
| tree | 433327999ae84395805929ade6aeb85749add8a6 /x11-libs/qt | |
| parent | Version bump from rc1 to rc2. (diff) | |
| download | gentoo-2-561ee73240bd7d14dd20a0bca82daae5fe1346c5.tar.gz gentoo-2-561ee73240bd7d14dd20a0bca82daae5fe1346c5.tar.bz2 gentoo-2-561ee73240bd7d14dd20a0bca82daae5fe1346c5.zip | |
Removing old stale versions
(Portage version: 2.0.51-r15)
Diffstat (limited to 'x11-libs/qt')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 14 | ||||
| -rw-r--r-- | x11-libs/qt/files/digest-qt-3.2.3-r1 | 1 | ||||
| -rw-r--r-- | x11-libs/qt/files/digest-qt-3.3.2 | 2 | ||||
| -rw-r--r-- | x11-libs/qt/files/digest-qt-3.3.3-r2 | 3 | ||||
| -rw-r--r-- | x11-libs/qt/files/digest-qt-3.3.3-r3 | 3 | ||||
| -rw-r--r-- | x11-libs/qt/files/digest-qt-3.3.4-r1 | 2 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt-3.2.3-qfontdatabase-i18n-20031024.patch | 374 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch | 372 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt-3.2.3-scriptForChar-20031128.patch | 546 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt-3.3.1-mips-relax-branches.patch | 20 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt-3.3.1-qclipboard-fix.patch | 94 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt-3.3.2-immodule-20040819.patch | 40 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt-3.3.2-mips-relax-branches.patch | 20 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.2.3-r1.ebuild | 182 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.2.ebuild | 225 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.3-r2.ebuild | 273 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.3-r3.ebuild | 280 | ||||
| -rw-r--r-- | x11-libs/qt/qt-3.3.4-r1.ebuild | 273 |
18 files changed, 13 insertions, 2711 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index ba3310d7a2a4..b888f9f23718 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for x11-libs/qt # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.198 2005/03/01 11:46:15 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.199 2005/03/01 14:08:09 caleb Exp $ + + 01 Mar 2005; Caleb Tennis <caleb@gentoo.org> + -files/qt-3.2.3-qfontdatabase-i18n-20031024.patch, + -files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch, + -files/qt-3.2.3-scriptForChar-20031128.patch, + -files/qt-3.3.1-mips-relax-branches.patch, + -files/qt-3.3.1-qclipboard-fix.patch, + -files/qt-3.3.2-immodule-20040819.patch, + -files/qt-3.3.2-mips-relax-branches.patch, -qt-3.2.3-r1.ebuild, + -qt-3.3.2.ebuild, -qt-3.3.3-r2.ebuild, -qt-3.3.3-r3.ebuild, + -qt-3.3.4-r1.ebuild: + Removing old stale versions 01 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> qt-3.3.4-r2.ebuild: Marked stable on amd64, bug 75181. diff --git a/x11-libs/qt/files/digest-qt-3.2.3-r1 b/x11-libs/qt/files/digest-qt-3.2.3-r1 deleted file mode 100644 index 8ed121a482cd..000000000000 --- a/x11-libs/qt/files/digest-qt-3.2.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 cd6df28c81ac00d97d62bd9942b8da03 qt-x11-free-3.2.3.tar.bz2 13952198 diff --git a/x11-libs/qt/files/digest-qt-3.3.2 b/x11-libs/qt/files/digest-qt-3.3.2 deleted file mode 100644 index 3f6c156a9735..000000000000 --- a/x11-libs/qt/files/digest-qt-3.3.2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 903cad618274ad84d7d13fd0027a6c3c qt-x11-free-3.3.2.tar.bz2 14434821 -MD5 93ad7baa2b4c35832baf47c101444355 qt-x11-immodule-unified-qt3.3.3-20040819.diff.gz 131600 diff --git a/x11-libs/qt/files/digest-qt-3.3.3-r2 b/x11-libs/qt/files/digest-qt-3.3.3-r2 deleted file mode 100644 index caaa95d83463..000000000000 --- a/x11-libs/qt/files/digest-qt-3.3.3-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3e0a0c8429b0a974b39b5f535ddff01c qt-x11-free-3.3.3.tar.bz2 14424812 -MD5 1053683f0d27854babc2a03db7360e23 qt-x11-immodule-unified-qt3.3.3-20040910.diff.gz 135277 -MD5 5ba58ddd3bf3d9c6f717b2366d1a5743 qt-3.3.3-darwin-fink.patch.gz 22581 diff --git a/x11-libs/qt/files/digest-qt-3.3.3-r3 b/x11-libs/qt/files/digest-qt-3.3.3-r3 deleted file mode 100644 index caaa95d83463..000000000000 --- a/x11-libs/qt/files/digest-qt-3.3.3-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3e0a0c8429b0a974b39b5f535ddff01c qt-x11-free-3.3.3.tar.bz2 14424812 -MD5 1053683f0d27854babc2a03db7360e23 qt-x11-immodule-unified-qt3.3.3-20040910.diff.gz 135277 -MD5 5ba58ddd3bf3d9c6f717b2366d1a5743 qt-3.3.3-darwin-fink.patch.gz 22581 diff --git a/x11-libs/qt/files/digest-qt-3.3.4-r1 b/x11-libs/qt/files/digest-qt-3.3.4-r1 deleted file mode 100644 index d12b1ee1a446..000000000000 --- a/x11-libs/qt/files/digest-qt-3.3.4-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 027f4e82fbe592b39d2f160bfb3a73af qt-x11-free-3.3.4.tar.bz2 14439722 -MD5 85fdf8ac3264a8849ebae74aa9c37a9b qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2 113389 diff --git a/x11-libs/qt/files/qt-3.2.3-qfontdatabase-i18n-20031024.patch b/x11-libs/qt/files/qt-3.2.3-qfontdatabase-i18n-20031024.patch deleted file mode 100644 index a904e5990995..000000000000 --- a/x11-libs/qt/files/qt-3.2.3-qfontdatabase-i18n-20031024.patch +++ /dev/null @@ -1,374 +0,0 @@ -diff -u qt-x11-free-3.2.2-patch/src-orig/kernel/qapplication_x11.cpp qt-x11-free-3.2.2-patch/src/kernel/qapplication_x11.cpp ---- qt-x11-free-3.2.2-patch/src-orig/kernel/qapplication_x11.cpp Fri Oct 10 10:47:25 2003 -+++ qt-x11-free-3.2.2-patch/src/kernel/qapplication_x11.cpp Fri Oct 24 02:52:58 2003 -@@ -999,7 +999,7 @@ - QString fam, skey; - QStringList::Iterator it = fontsubs.begin(); - while (it != fontsubs.end()) { -- fam = (*it++).latin1(); -+ fam = *it++; - skey = "/qt/Font Substitutions/" + fam; - subs = settings.readListEntry(skey); - QFont::insertSubstitutions(fam, subs); -diff -u qt-x11-free-3.2.2-patch/src-orig/kernel/qfontdatabase.cpp qt-x11-free-3.2.2-patch/src/kernel/qfontdatabase.cpp ---- qt-x11-free-3.2.2-patch/src-orig/kernel/qfontdatabase.cpp Fri Oct 10 10:47:32 2003 -+++ qt-x11-free-3.2.2-patch/src/kernel/qfontdatabase.cpp Fri Oct 24 02:52:58 2003 -@@ -67,6 +67,11 @@ - # define for if(0){}else for - #endif - -+#ifdef Q_WS_X11 -+#include <qdict.h> -+QDict<QString> *qt_FamilyDictXft = 0; -+#endif -+ - static int ucstricmp( const QString &as, const QString &bs ) - { - const QChar *a = as.unicode(); -@@ -205,6 +210,7 @@ - { - #if defined(Q_WS_X11) - weightName = setwidthName = 0; -+ rawName = ""; - #endif // Q_WS_X11 - } - -@@ -228,6 +234,7 @@ - #ifdef Q_WS_X11 - const char *weightName; - const char *setwidthName; -+ QString rawName; - #endif // Q_WS_X11 - - QtFontSize *pixelSize( unsigned short size, bool = FALSE ); -@@ -2331,6 +2338,14 @@ - foundry = QString::null; - family = name; - } -+ -+#ifdef Q_WS_X11 -+ if ( qt_FamilyDictXft && !family.isEmpty() ) { -+ QString* ptr = qt_FamilyDictXft->find( family ); -+ if ( ptr ) -+ family = *ptr; -+ } -+#endif // Q_WS_X11 - } - - #endif // QT_NO_FONTDATABASE -diff -u qt-x11-free-3.2.2-patch/src-orig/kernel/qfontdatabase_x11.cpp qt-x11-free-3.2.2-patch/src/kernel/qfontdatabase_x11.cpp ---- qt-x11-free-3.2.2-patch/src-orig/kernel/qfontdatabase_x11.cpp Fri Oct 10 10:47:29 2003 -+++ qt-x11-free-3.2.2-patch/src/kernel/qfontdatabase_x11.cpp Fri Oct 24 02:52:58 2003 -@@ -52,6 +52,9 @@ - - #ifndef QT_NO_XFTFREETYPE - #include <freetype/freetype.h> -+#include <qfile.h> -+#include <qdict.h> -+#include <qtextcodec.h> - #endif - - #ifdef QFONTDATABASE_DEBUG -@@ -783,11 +786,185 @@ - return qtweight; - } - -+ -+static void getInfoFromSfntTables( const char *file, uint index, -+ QByteArray &tmp_buffer, -+ QTextCodec *locale, QTextCodec *utf16, -+ QString &familyName, int &spacing ) -+{ -+#define Q_GET_ULONG( p ) ( ( (Q_UINT32)(((Q_UINT8*)(p))[0]) << 24 ) | \ -+ ( (Q_UINT32)(((Q_UINT8*)(p))[1]) << 16 ) | \ -+ ( (Q_UINT32)(((Q_UINT8*)(p))[2]) << 8 ) | \ -+ ( (Q_UINT32)(((Q_UINT8*)(p))[3]) << 0 ) ) -+#define Q_GET_USHORT( p ) ( ( (Q_UINT16)(((Q_UINT8*)(p))[0]) << 8 ) | \ -+ ( (Q_UINT16)(((Q_UINT8*)(p))[1]) << 0 ) ) -+ -+ QFile f( QFile::decodeName( QCString( file ) ) ); -+ if ( !f.open( IO_ReadOnly ) ) -+ return; -+ -+ char* buf = tmp_buffer.data(); -+ char* b = buf; -+ Q_UINT16 i; -+ -+ if ( f.readBlock( buf, 12 ) < 12 ) -+ return; -+ -+ if ( b[0] == 't' && b[1] == 't' && b[2] == 'c' && b[3] == 'f' ) { -+ Q_ULONG numFonts = Q_GET_ULONG( b+8 ); -+ if ( index + 1 > numFonts ) -+ return; -+ if ( !f.at( 12 + 4*index ) || f.readBlock( buf, 4 ) < 4 ) -+ return; -+ Q_ULONG OffsetTable = Q_GET_ULONG( b ); -+ if ( !f.at( OffsetTable ) || f.readBlock( buf, 12 ) < 12 ) -+ return; -+ } -+ else if ( index > 0 ) -+ return; -+ -+ // TrueType or CFF ? -+ if ( !( b[0] == 0 && b[1] == 1 && b[2] == 0 && b[3] == 0 ) && -+ !( b[0] == 'O' && b[1] == 'T' && b[2] == 'T' && b[3] == 'O' ) ) -+ return; -+ -+ Q_ULONG numTables = Q_GET_USHORT( b+4 ); -+ if ( numTables == 0 || numTables > 64 || -+ (Q_ULONG)f.readBlock( buf, 16 * numTables ) < 16 * numTables ) -+ return; -+ -+ if ( spacing == XFT_PROPORTIONAL ) { -+ for ( i = 0, b = buf; i < numTables; i++, b += 16 ) { -+ if ( b[0] == 'O' && b[1] == 'S' && b[2] == '/' && b[3] == '2' ) { -+ Q_ULONG offset = Q_GET_ULONG( b+8 ); -+ Q_UINT8 panose[10]; -+ -+ if ( !f.at( offset + 16*2 ) || -+ f.readBlock( (char *)panose, 10 ) < 10 ) -+ break; -+ -+ if ( panose[3] == 9 ) -+ spacing = XFT_MONO; -+ break; -+ } -+ } -+ } -+ -+ -+ Q_ULONG table_length = 0; -+ for ( i = 0, b = buf; i < numTables; i++, b += 16 ) { -+ if ( b[0] == 'n' && b[1] == 'a' && b[2] == 'm' && b[3] == 'e' ) { -+ Q_ULONG offset = Q_GET_ULONG( b+8 ); -+ Q_ULONG length = Q_GET_ULONG( b+12 ); -+ -+ if ( length < 12 ) -+ return; -+ if ( length > tmp_buffer.size() && -+ !tmp_buffer.resize( length, QGArray::SpeedOptim ) ) -+ return; -+ -+ buf = tmp_buffer.data(); -+ if ( !f.at( offset ) || (Q_ULONG)f.readBlock( buf, length ) < length ) -+ return; -+ -+ table_length = length; -+ break; -+ } -+ } -+ -+ if ( i == numTables ) -+ return; -+ -+ b = buf; -+ Q_UINT16 count = Q_GET_USHORT( b+2 ); -+ Q_UINT16 stringOffset = Q_GET_USHORT( b+4 ); -+ if ( (Q_ULONG)( 12 + 12 * count ) > table_length ) -+ return; -+ -+ QStringList nameList( familyName ); -+ char* strings = buf + stringOffset; -+ char* limit = buf + table_length; -+ int n_locNames = 0; -+ for ( i = 0, b = buf + 6; i < count; i++, b += 12 ) { -+ Q_UINT16 platformID = Q_GET_USHORT( b+0 ); -+ Q_UINT16 encodingID = Q_GET_USHORT( b+2 ); -+ // Q_UINT16 languageID = Q_GET_ULONG( b+4 ); -+ Q_UINT16 nameID = Q_GET_USHORT( b+6 ); -+ Q_UINT16 length = Q_GET_USHORT( b+8 ); -+ Q_UINT16 offset = Q_GET_USHORT( b+10 ); -+ -+ if ( platformID != 3 || // ! Microsoft -+ encodingID != 1 || // ! UTF16 -+ nameID != 1 || // ! family name -+ strings + offset + length > limit ) // oversize -+ continue; -+ -+ QString family = utf16->toUnicode( strings + offset, length ); -+ -+ family.replace('-', ' '); -+ family.replace("/", ""); -+ -+ if ( !nameList.contains( family ) ) { -+ if ( locale && locale->canEncode( family ) ) { -+ nameList.prepend( family ); -+ n_locNames += 1; -+ -+ } else { -+ nameList.append( family ); -+ } -+ } -+ } -+ -+ if ( n_locNames > 0 ) { -+ familyName = ""; -+ -+ QStringList::iterator it = nameList.begin(); -+ for ( ; n_locNames > 0; --n_locNames, ++it ) { -+ const unsigned short* ucs2 = (*it).ucs2(); -+ uint len = (*it).length(); -+ -+ for ( ; len > 0; len-- ) { -+ if ( *ucs2++ >= 128 ) { -+ familyName = *it; -+ nameList.remove( it ); -+ break; -+ } -+ } -+ -+ if ( len > 0 ) -+ break; -+ } -+ -+ if ( familyName.isEmpty() ) { -+ familyName = *nameList.begin(); -+ nameList.remove( nameList.begin() ); -+ } -+ -+ } else { -+ nameList.remove( nameList.begin() ); -+ } -+ -+ if ( nameList.count() > 0 ) { -+ QStringList::iterator it = nameList.begin(); -+ QStringList::iterator end = nameList.end(); -+ -+ for ( ; it != end; ++it ) { -+ qt_FamilyDictXft->insert( *it, new QString( familyName ) ); -+ } -+ } -+} -+ -+ - static void loadXft() - { - if (!qt_has_xft) - return; - -+ if ( !qt_FamilyDictXft ) { -+ qt_FamilyDictXft = new QDict<QString>( 17, FALSE ); -+ qt_FamilyDictXft->setAutoDelete( TRUE ); -+ } -+ - XftFontSet *fonts; - - QString familyName; -@@ -798,13 +975,43 @@ - int spacing_value; - char *file_value; - int index_value; -+ char *style_value; -+ -+ QByteArray tmp_buffer( 4096 ); -+ QTextCodec *utf16 = QTextCodec::codecForName( "ISO-10646-UCS-2" ); -+ QTextCodec *locale = QTextCodec::codecForLocale(); -+ -+ int mib = locale ? locale->mibEnum() : 4; -+ switch ( mib ) { -+#if 1 -+ case 4: // Latin1 -+ case 111: // Latin15 -+ locale = 0; -+ break; -+#else -+ case 38: // eucKR -+ case 2025: // GB2312 -+ case 113: // GBK -+ case 114: // GB18030 -+ case 2026: // Big5 -+ case 2101: // Big5-HKSCS -+ case 16: // JIS7 -+ case 17: // SJIS -+ case 18: // eucJP -+ break; -+ -+ default: -+ locale = 0; -+ break; -+#endif -+ } - - fonts = - XftListFonts(QPaintDevice::x11AppDisplay(), - QPaintDevice::x11AppScreen(), - (const char *)0, - XFT_FAMILY, XFT_WEIGHT, XFT_SLANT, -- XFT_SPACING, XFT_FILE, XFT_INDEX, -+ XFT_SPACING, XFT_FILE, XFT_INDEX, XFT_STYLE, - #ifdef QT_XFT2 - FC_CHARSET, - #endif // QT_XFT2 -@@ -828,6 +1035,10 @@ - XftPatternGetString (fonts->fonts[i], XFT_FILE, 0, &file_value); - XftPatternGetInteger (fonts->fonts[i], XFT_INDEX, 0, &index_value); - -+ getInfoFromSfntTables( file_value, index_value, -+ tmp_buffer, locale, utf16, -+ familyName, spacing_value ); -+ - QtFontFamily *family = db->family( familyName, TRUE ); - family->rawName = rawName; - family->hasXft = TRUE; -@@ -867,6 +1078,10 @@ - style->smoothScalable = TRUE; - family->fixedPitch = ( spacing_value >= XFT_MONO ); - -+ if ( XftPatternGetString (fonts->fonts[i], -+ XFT_STYLE, 0, &style_value) == XftResultMatch ) -+ style->rawName = QString::fromUtf8( style_value ); -+ - QtFontSize *size = style->pixelSize( SMOOTH_SCALABLE, TRUE ); - QtFontEncoding *enc = size->encodingID( -1, 0, 0, 0, 0, TRUE ); - enc->pitch = ( spacing_value >= XFT_CHARCELL ? 'c' : -@@ -874,6 +1089,11 @@ - } - - XftFontSetDestroy (fonts); -+ -+ if ( qt_FamilyDictXft->count() == 0 ) { -+ delete qt_FamilyDictXft; -+ qt_FamilyDictXft = 0; -+ } - } - - #ifndef QT_XFT2 -@@ -1192,6 +1412,7 @@ - equiv->fakeOblique = TRUE; - #endif // !QT_XFT2 - equiv->smoothScalable = TRUE; -+ equiv->rawName = style->rawName; - - QtFontSize *equiv_size = equiv->pixelSize( SMOOTH_SCALABLE, TRUE ); - QtFontEncoding *equiv_enc = equiv_size->encodingID( -1, 0, 0, 0, 0, TRUE ); -@@ -1309,6 +1530,11 @@ - XftPatternAddString( pattern, XFT_FAMILY, - family->rawName.utf8().data() ); - -+ if ( !style->rawName.isEmpty() ) -+ XftPatternAddString( pattern, XFT_STYLE, -+ style->rawName.utf8().data() ); -+ -+ - const char *stylehint_value = 0; - switch ( request.styleHint ) { - case QFont::SansSerif: -@@ -1396,6 +1622,17 @@ - XftPattern *result = - XftFontMatch( QPaintDevice::x11AppDisplay(), fp->screen, pattern, &res ); - XftPatternDestroy(pattern); -+ -+ for ( int s = QFont::Han; s <= QFont::Yi; s++ ) { -+ if ( !( family->scripts[s] & QtFontFamily::UnSupported_Xft ) ) { -+ XftPatternDel( result, XFT_SPACING ); -+# ifdef QT_XFT2 -+ FcPatternDel( result, FC_GLOBAL_ADVANCE ); -+ FcPatternAddBool( result, FC_GLOBAL_ADVANCE, FcFalse ); -+ break; -+# endif -+ } -+ } - - // We pass a duplicate to XftFontOpenPattern because either xft font - // will own the pattern after the call or the pattern will be diff --git a/x11-libs/qt/files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch b/x11-libs/qt/files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch deleted file mode 100644 index 22b2439c6914..000000000000 --- a/x11-libs/qt/files/qt-3.2.3-qpsprinter-useFreeType2-20031128.patch +++ /dev/null @@ -1,372 +0,0 @@ ---- qt-x11-free-3.2.3-fix/src/kernel/qpsprinter.cpp Mon Nov 10 19:21:57 2003 -+++ qt-x11-free-3.2.3/src/kernel/qpsprinter.cpp Fri Nov 28 20:25:38 2003 -@@ -98,6 +98,12 @@ - #include "qtextlayout_p.h" - #include "qtextengine_p.h" - extern bool qt_has_xft; -+ -+#ifndef QT_NO_XFTFREETYPE -+#include <ft2build.h> -+#include FT_OUTLINE_H -+#endif -+ - #endif - - static bool qt_gen_epsf = FALSE; -@@ -2076,6 +2082,32 @@ - - // ================== TTF ==================== - -+#ifndef QT_NO_XFTFREETYPE -+ -+static void -+getXftData( const QFontEngine *engine, -+ int &index, int &weight, int &slant, XftMatrix &matrix ) -+{ -+ XftPattern* font = static_cast<const QFontEngineXft *>( engine )->pattern(); -+ XftMatrix unit = { 1.0, 0, 0, 1.0 }; -+ XftMatrix* mat; -+ -+ index = 0; -+ weight = XFT_WEIGHT_MEDIUM; -+ slant = XFT_SLANT_ROMAN; -+ matrix = unit; -+ -+ XftPatternGetInteger( font, XFT_INDEX, 0, &index ); -+ XftPatternGetInteger( font, XFT_WEIGHT, 0, &weight ); -+ XftPatternGetInteger( font, XFT_SLANT, 0, &slant ); -+ -+ if ( XftPatternGetMatrix( font, XFT_MATRIX, 0, &mat ) == XftResultMatch ) -+ matrix = *mat; -+} -+ -+#endif // QT_NO_XFTFREETYPE -+ -+ - typedef Q_UINT8 BYTE; - typedef Q_UINT16 USHORT; - typedef Q_UINT16 uFWord; -@@ -2184,6 +2216,16 @@ - - int indexToLocFormat; /* short or long offsets */ - -+#ifndef QT_NO_XFTFREETYPE -+ FT_Face face; -+ int index; -+ int weight; -+ int slant; -+ XftMatrix matrix; -+ -+ QString StyleName_Extension; -+#endif // QT_NO_XFTFREETYPE -+ - }; - - -@@ -2293,6 +2335,58 @@ - #endif - offset_table = (unsigned char*) data.data(); /* first 12 bytes */ - -+#ifndef QT_NO_XFTFREETYPE -+ if ( target_type == 42 ) { -+ if ( !( d[0] == '0' && d[1] == '1' && d[2] == '0' && d[3] == '0' ) ) { -+ defective = TRUE; -+ return; -+ } -+ } -+ -+ face = 0; -+ StyleName_Extension = ""; -+ getXftData( f, index, weight, slant, matrix ); -+ -+ if ( qt_has_xft && f->type() == QFontEngine::Xft ) { -+ extern FT_Library _XftFTlibrary; -+ -+ if ( FT_New_Memory_Face( _XftFTlibrary, -+ (const FT_Byte*)data.data(), -+ data.size(), index, &face ) || -+ ( face->face_flags & FT_FACE_FLAG_SCALABLE ) == 0 ) { -+ defective = TRUE; -+ return; -+ } -+ -+ FT_Set_Pixel_Sizes( face, 1000, 1000 ); -+ -+ bool bold = ( face->style_flags & FT_STYLE_FLAG_BOLD ) != 0; -+ bool italic = ( face->style_flags & FT_STYLE_FLAG_ITALIC ) != 0; -+ -+ if ( weight > XFT_WEIGHT_MEDIUM && !bold ) -+ StyleName_Extension += "Bold"; -+ if ( slant > XFT_SLANT_ROMAN && !italic ) -+ StyleName_Extension += "Oblique"; -+ -+ if ( !StyleName_Extension.isEmpty() ) -+ StyleName_Extension = "-" + StyleName_Extension; -+ -+ if ( matrix.xx != 1.0 || matrix.xy != 0.0 || -+ matrix.yx != 0.0 || matrix.yy != 1.0 ) -+ StyleName_Extension += QString( "-%1-%2-%3-%4" ) -+ .arg( matrix.xx, 0, 'f' ) -+ .arg( matrix.yx, 0, 'f' ) -+ .arg( matrix.xy, 0, 'f' ) -+ .arg( matrix.yy, 0, 'f' ); -+ -+ StyleName_Extension.replace( '.', '_' ); -+ } -+ -+ if ( d[0] == 't' && d[1] == 't' && d[2] == 'c' && d[3] == 'f' ) -+ offset_table += getULONG( offset_table + 12 + 4 * index ); -+#endif -+ -+ - /* Determine how many directory entries there are. */ - numTables = getUSHORT( offset_table + 4 ); - -@@ -2408,6 +2502,11 @@ - // qDebug("number of glyphs is %d", numGlyphs); - replacementList = makePSFontNameList( f, psname ); - uni2glyphSetup(); -+ -+#ifndef QT_NO_XFTFREETYPE -+ psname += StyleName_Extension; -+ FullName += StyleName_Extension; -+#endif - } - - -@@ -2524,7 +2623,7 @@ - if( target_type == 42 ) - s << "%%Creator: Converted from TrueType to type 42 by Qt\n"; - else -- s << "%%Creator: Converted from TrueType by Qt\n"; -+ s << "%%Creator: Converted from TrueType/OpenType by Qt\n"; - - /* If VM usage information is available, print it. */ - if( target_type == 42 && post_table) -@@ -2546,7 +2645,7 @@ - s << "/_d{bind def}bind def\n"; - s << "/_m{moveto}_d\n"; - s << "/_l{lineto}_d\n"; -- s << "/_cl{closepath eofill}_d\n"; -+ s << "/_cl{closepath fill}_d\n"; - s << "/_c{curveto}_d\n"; - s << "/_sc{7 -1 roll{setcachedevice}{pop pop pop pop pop pop}ifelse}_d\n"; - s << "/_e{exec}_d\n"; -@@ -2560,7 +2659,15 @@ - if(target_type == 42) - s << "/FontMatrix[1 0 0 1 0 0]def\n"; - else -+#ifndef QT_NO_XFTFREETYPE -+ s << QString( "/FontMatrix[%1 %2 %3 %4 0 0]def\n" ) -+ .arg( 0.001 * matrix.xx, 0, 'f', 6 ) -+ .arg( 0.001 * matrix.yx, 0, 'f', 6 ) -+ .arg( 0.001 * matrix.xy, 0, 'f', 6 ) -+ .arg( 0.001 * matrix.yy, 0, 'f', 6 ); -+#else - s << "/FontMatrix[.001 0 0 .001 0 0]def\n"; -+#endif - - s << "/FontBBox["; - s<< llx; -@@ -2703,6 +2810,11 @@ - - s << "end readonly def\n"; - -+ if ( face ) { -+ FT_Done_Face( face ); -+ face = 0; -+ } -+ - // === trailer === - - /* If we are generating a type 3 font, we need to provide */ -@@ -2845,7 +2957,7 @@ - offset = getULONG( ptr + 8 ); - //length = getULONG( ptr + 12 ); - -- table = offset_table + offset; -+ table = (BYTE*)data.data() + offset; - return table; - } - -@@ -3348,6 +3460,123 @@ - } - } - -+ -+#ifndef QT_NO_XFTFREETYPE -+ -+#undef DOWNSCALE -+#define DOWNSCALE( x ) ( ( (x) + 32 ) >> 6 ) -+ -+extern "C" { -+ -+static FT_Vector from; -+ -+ static FT_Error -+ PSMovetoFT( FT_Vector* to, QTextStream *s ) -+ { -+ if ( !to ) { -+ stack( 100, 1, *s ); -+ (*s) << " _cl"; -+ } else { -+ stack( 100, 3, *s ); -+ (*s) << DOWNSCALE( to->x ) << " " -+ << DOWNSCALE( to->y ) << " _m\n"; -+ from = *to; -+ } -+ -+ return FT_Err_Ok; -+ } -+ -+ static FT_Error -+ PSLinetoFT( FT_Vector* to, -+ QTextStream *s ) -+ { -+ stack( 100, 3, *s ); -+ (*s) << DOWNSCALE( to->x ) << " " -+ << DOWNSCALE( to->y ) << " _l\n"; -+ from = *to; -+ return FT_Err_Ok; -+ } -+ -+ static FT_Error -+ PSCubictoFT( FT_Vector* ctrl1, FT_Vector* ctrl2, FT_Vector* to, -+ QTextStream *s ) -+ { -+ stack( 100, 7, *s ); -+ (*s) << DOWNSCALE( ctrl1->x ) << " " -+ << DOWNSCALE( ctrl1->y ) << " " -+ << DOWNSCALE( ctrl2->x ) << " " -+ << DOWNSCALE( ctrl2->y ) << " " -+ << DOWNSCALE( to->x ) << " " -+ << DOWNSCALE( to->y ) << " _c\n"; -+ from = *to; -+ return FT_Err_Ok; -+ } -+ -+ static FT_Error -+ PSConictoFT( FT_Vector* ctrl, FT_Vector* to, -+ QTextStream *s ) -+ { -+ FT_Vector ctrl1, ctrl2; -+ -+ -+ ctrl1.x = ( from.x + 2*ctrl->x ) / 3; -+ ctrl1.y = ( from.y + 2*ctrl->y ) / 3; -+ ctrl2.x = ( to->x + 2*ctrl->x ) / 3; -+ ctrl2.y = ( to->y + 2*ctrl->y ) / 3; -+ -+ return PSCubictoFT( &ctrl1, &ctrl2, to, s ); -+ } -+ -+} // extern "C" -+ -+static void -+charprocFT( FT_Face face, FT_UInt glyph_index, -+ int weight, int slant, QTextStream &s ) -+{ -+ static const FT_Outline_Funcs funcs = -+ { -+ (FT_Outline_MoveToFunc) PSMovetoFT, -+ (FT_Outline_LineToFunc) PSLinetoFT, -+ (FT_Outline_ConicToFunc) PSConictoFT, -+ (FT_Outline_CubicToFunc) PSCubictoFT, -+ 0, 0 -+ }; -+ -+ FT_Int32 load_flags = FT_LOAD_NO_BITMAP | -+ FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; -+ -+ Q_UNUSED( weight ); -+ Q_UNUSED( slant ); -+ -+ if ( !FT_Load_Glyph( face, glyph_index, load_flags ) ) { -+ FT_Glyph_Metrics* metrics = &face->glyph->metrics; -+ -+ stack( 100, 7, s ); -+ s << ( ( face->glyph->linearHoriAdvance + 0x8000L ) >> 16 ); -+ s << " 0 "; -+ s << DOWNSCALE( metrics->horiBearingX ); -+ s << " "; -+ s << DOWNSCALE( metrics->horiBearingY - metrics->height ); -+ s << " "; -+ s << DOWNSCALE( metrics->horiBearingX + metrics->width ); -+ s << " "; -+ s << DOWNSCALE( metrics->horiBearingY ); -+ s << " _sc\n"; -+ -+ FT_Outline_Decompose( &face->glyph->outline, &funcs, &s ); -+ PSMovetoFT( 0, &s ); -+ -+ } else { -+ stack( 7, 7, s ); -+ s << "0 0 0 0 0 0 0 _sc\n"; -+ } -+ -+ stack_end( s ); -+ return; -+} -+ -+#endif // QT_NO_XFTFREETYPE -+ - // postscript drawing commands - - static void PSMoveto(FWord x, FWord y, QTextStream& ts) -@@ -3742,6 +3971,12 @@ - charproc_data cd; - - glyphset[charindex] = TRUE; -+ -+#ifndef QT_NO_XFTFREETYPE -+ if ( face ) -+ return; -+#endif // QT_NO_XFTFREETYPE -+ - //printf("subsetting %s ==> ",glyphName(charindex).latin1()); - - /* Get a pointer to the data. */ -@@ -3943,6 +4178,11 @@ - s << "\n"; - #endif - -+ if ( face ) { -+ charprocFT( face, charindex, weight, slant, s ); -+ return; -+ } -+ - /* Get a pointer to the data. */ - BYTE* glyph = charprocFindGlyphData( charindex ); - -@@ -4889,9 +5129,17 @@ - char *filename = 0; - XftPatternGetString (pattern, XFT_FILE, 0, &filename); - //qDebug("filename for font is '%s'", filename); -+ int index, weight, slant; -+ XftMatrix matrix; -+ getXftData (engine, index, weight, slant, matrix); -+ QString style = QString("-I%1-W%2-S%3-M[%4,%5,%6,%7]") -+ .arg(index).arg(weight).arg(slant) -+ .arg(matrix.xx).arg(matrix.xy) -+ .arg(matrix.yx).arg(matrix.yy); -+ - if ( filename ) { - fontfilename = QString::fromLocal8Bit( filename ); -- xfontname = fontfilename; -+ xfontname = fontfilename + style; - } - } else - #endif -@@ -5030,6 +5278,12 @@ - type = PFA; - else if (d[0]==0x00 && d[1]==0x01 && d[2]==0x00 && d[3]==0x00) - type = TTF; -+#ifndef QT_NO_XFTFREETYPE -+ else if (d[0]=='t' && d[1]=='t' && d[2]=='c' && d[3]=='f') -+ type = TTF; -+ else if (d[0]=='O' && d[1]=='T' && d[2]=='T' && d[3]=='O') -+ type = TTF; -+#endif // QT_NO_XFTFREETYPE - else - type = NONE; - } else diff --git a/x11-libs/qt/files/qt-3.2.3-scriptForChar-20031128.patch b/x11-libs/qt/files/qt-3.2.3-scriptForChar-20031128.patch deleted file mode 100644 index ae567d1c35b1..000000000000 --- a/x11-libs/qt/files/qt-3.2.3-scriptForChar-20031128.patch +++ /dev/null @@ -1,546 +0,0 @@ -diff -ur qt-x11-free-3.2.3-fix/src-orig/kernel/qfont.cpp qt-x11-free-3.2.3-fix/src/kernel/qfont.cpp ---- qt-x11-free-3.2.3-fix/src-orig/kernel/qfont.cpp Mon Nov 10 19:21:57 2003 -+++ qt-x11-free-3.2.3-fix/src/kernel/qfont.cpp Fri Nov 28 20:44:37 2003 -@@ -208,6 +208,10 @@ - #ifndef Q_WS_MAC - memset( widthCache, 0, widthCacheSize*sizeof( uchar ) ); - #endif -+#ifdef Q_WS_X11 -+ memset( scripts_uniEngine, 0, QFont::LastPrivateScript * sizeof( uchar ) ); -+ uniEngine = 0; -+#endif - } - - QFontEngineData::~QFontEngineData() -@@ -223,6 +227,10 @@ - engine->deref(); - engine = 0; - #endif // Q_WS_X11 || Q_WS_WIN -+#ifdef Q_WS_X11 -+ memset( scripts_uniEngine, 0, QFont::LastPrivateScript * sizeof( uchar ) ); -+ uniEngine = 0; -+#endif - } - - -@@ -1244,7 +1252,7 @@ - */ - bool QFont::exactMatch() const - { -- QFontEngine *engine = d->engineForScript( QFont::NoScript ); -+ QFontEngine *engine = d->m_engineForScript( QFont::NoScript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -1976,8 +1984,8 @@ - */ - int QFontMetrics::ascent() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -- QFontEngine *latin_engine = d->engineForScript( QFont::Latin ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); -+ QFontEngine *latin_engine = d->m_engineForScript( QFont::Latin ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); -@@ -2000,8 +2008,8 @@ - */ - int QFontMetrics::descent() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -- QFontEngine *latin_engine = d->engineForScript( QFont::Latin ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); -+ QFontEngine *latin_engine = d->m_engineForScript( QFont::Latin ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); -@@ -2020,8 +2028,8 @@ - */ - int QFontMetrics::height() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -- QFontEngine *latin_engine = d->engineForScript( QFont::Latin ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); -+ QFontEngine *latin_engine = d->m_engineForScript( QFont::Latin ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); -@@ -2040,8 +2048,8 @@ - */ - int QFontMetrics::leading() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -- QFontEngine *latin_engine = d->engineForScript( QFont::Latin ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); -+ QFontEngine *latin_engine = d->m_engineForScript( QFont::Latin ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); -@@ -2059,8 +2067,8 @@ - */ - int QFontMetrics::lineSpacing() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -- QFontEngine *latin_engine = d->engineForScript( QFont::Latin ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); -+ QFontEngine *latin_engine = d->m_engineForScript( QFont::Latin ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); -@@ -2083,8 +2091,8 @@ - */ - int QFontMetrics::minLeftBearing() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -- QFontEngine *latin_engine = d->engineForScript( QFont::Latin ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); -+ QFontEngine *latin_engine = d->m_engineForScript( QFont::Latin ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); -@@ -2105,8 +2113,8 @@ - */ - int QFontMetrics::minRightBearing() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -- QFontEngine *latin_engine = d->engineForScript( QFont::Latin ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); -+ QFontEngine *latin_engine = d->m_engineForScript( QFont::Latin ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( latin_engine != 0 ); -@@ -2120,8 +2128,8 @@ - */ - int QFontMetrics::maxWidth() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -- QFontEngine *lengine = d->engineForScript( QFont::Latin ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); -+ QFontEngine *lengine = d->m_engineForScript( QFont::Latin ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - Q_ASSERT( lengine != 0 ); -@@ -2137,7 +2145,7 @@ - bool QFontMetrics::inFont(QChar ch) const - { - QFont::Script script; -- SCRIPT_FOR_CHAR( script, ch ); -+ SCRIPT_FOR_CHAR( script, ch, d ); - - QFontEngine *engine = d->engineForScript( script ); - #ifdef QT_CHECK_STATE -@@ -2164,7 +2172,7 @@ - int QFontMetrics::leftBearing(QChar ch) const - { - QFont::Script script; -- SCRIPT_FOR_CHAR( script, ch ); -+ SCRIPT_FOR_CHAR( script, ch, d ); - - QFontEngine *engine = d->engineForScript( script ); - #ifdef QT_CHECK_STATE -@@ -2198,7 +2206,7 @@ - int QFontMetrics::rightBearing(QChar ch) const - { - QFont::Script script; -- SCRIPT_FOR_CHAR( script, ch ); -+ SCRIPT_FOR_CHAR( script, ch, d ); - - QFontEngine *engine = d->engineForScript( script ); - #ifdef QT_CHECK_STATE -@@ -2248,7 +2256,7 @@ - width += d->engineData->widthCache[uc]; - else if ( ::category( *ch ) != QChar::Mark_NonSpacing ) { - QFont::Script script; -- SCRIPT_FOR_CHAR( script, *ch ); -+ SCRIPT_FOR_CHAR( script, *ch, d ); - - if (script >= QFont::Arabic && script <= QFont::Khmer) - break; -@@ -2378,7 +2386,7 @@ - QRect QFontMetrics::boundingRect( QChar ch ) const - { - QFont::Script script; -- SCRIPT_FOR_CHAR( script, ch ); -+ SCRIPT_FOR_CHAR( script, ch, d ); - - QFontEngine *engine = d->engineForScript( script ); - #ifdef QT_CHECK_STATE -@@ -2519,7 +2527,7 @@ - */ - int QFontMetrics::underlinePos() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -2559,7 +2567,7 @@ - */ - int QFontMetrics::lineWidth() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -2715,7 +2723,7 @@ - */ - QString QFontInfo::family() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -2729,7 +2737,7 @@ - */ - int QFontInfo::pointSize() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -2743,7 +2751,7 @@ - */ - int QFontInfo::pixelSize() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -2757,7 +2765,7 @@ - */ - bool QFontInfo::italic() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -2771,7 +2779,7 @@ - */ - int QFontInfo::weight() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -2838,7 +2846,7 @@ - */ - bool QFontInfo::fixedPitch() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -2865,7 +2873,7 @@ - */ - QFont::StyleHint QFontInfo::styleHint() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -2895,7 +2903,7 @@ - */ - bool QFontInfo::exactMatch() const - { -- QFontEngine *engine = d->engineForScript( (QFont::Script) fscript ); -+ QFontEngine *engine = d->m_engineForScript( (QFont::Script) fscript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -diff -ur qt-x11-free-3.2.3-fix/src-orig/kernel/qfont_x11.cpp qt-x11-free-3.2.3-fix/src/kernel/qfont_x11.cpp ---- qt-x11-free-3.2.3-fix/src-orig/kernel/qfont_x11.cpp Mon Nov 10 19:22:04 2003 -+++ qt-x11-free-3.2.3-fix/src/kernel/qfont_x11.cpp Fri Nov 28 20:44:37 2003 -@@ -56,6 +56,7 @@ - #include "qfontdata_p.h" - #include "qfontengine_p.h" - #include "qtextengine_p.h" -+#include "qscriptengine_p.h" - - #include "qt_x11_p.h" - -@@ -277,7 +278,7 @@ - QFontPrivate *priv = new QFontPrivate; - - for ( uint i = 0; i < sample.length(); i++ ) { -- SCRIPT_FOR_CHAR( tmp, *uc ); -+ SCRIPT_FOR_CHAR( tmp, *uc, 0 ); - uc++; - if ( tmp != cs && tmp != QFont::UnknownScript ) { - cs = tmp; -@@ -364,12 +365,23 @@ - // the cached engineData could have already loaded the engine we want - if ( engineData->engines[script] ) return; - -+ static ShapeFunction basic_shape = scriptEngines[QFont::Latin].shape; -+ QFontEngine *uniEngine = 0; -+ -+ if ( script != QFont::Unicode && -+ scriptEngines[script].shape == basic_shape ) { -+ if ( !engineData->engines[QFont::Unicode] ) -+ load( QFont::Unicode ); -+ uniEngine = engineData->uniEngine; -+ } -+ - // load the font - QFontEngine *engine = 0; - // double scale = 1.0; // ### TODO: fix the scale calculations - - // list of families to try - QStringList family_list = QStringList::split( ',', req.family ); -+ int count = family_list.count(); - - // append the substitute list for each family in family_list - QStringList subs_list; -@@ -399,13 +411,17 @@ - family_list << QString::null; - - it = family_list.begin(), end = family_list.end(); -- for ( ; ! engine && it != end; ++it ) { -+ for ( ; ! engine && it != end; ++it, --count ) { - req.family = *it; - - engine = QFontDatabase::findFont( script, this, req ); - if ( engine ) { -- if ( engine->type() != QFontEngine::Box ) -- break; -+ if ( engine->type() != QFontEngine::Box ) { -+ if ( script != QFont::Unicode && engine == uniEngine ) -+ engineData->scripts_uniEngine[script] = 1; -+ if ( engine != uniEngine ) -+ break; -+ } - - if ( ! req.family.isEmpty() ) - engine = 0; -@@ -416,6 +432,49 @@ - - engine->ref(); - engineData->engines[script] = engine; -+ -+ if ( script == QFont::Unicode && count > 0 ) { -+ QString req_family, req_foundry, font_family, font_foundry; -+ -+ QFontDatabase::parseFontName(req.family, req_foundry, req_family); -+ QFontDatabase::parseFontName(engine->fontDef.family, -+ font_foundry, font_family); -+ -+ if ( req_family == font_family && -+ ( req_foundry.isEmpty() || -+ font_foundry.isEmpty() || -+ req_foundry == font_foundry ) ) -+ engineData->uniEngine = engine; -+ } -+} -+ -+QFont::Script QFontPrivate::checkSpecialScript( QFont::Script script, -+ const QChar &ch ) -+{ -+ static ShapeFunction basic_shape = scriptEngines[QFont::Latin].shape; -+ -+ if ( scriptEngines[script].shape != basic_shape ) -+ return script; -+ -+ if ( !engineData || !engineData->engines[QFont::Unicode] ) -+ load( QFont::Unicode ); -+ -+ if ( engineData->uniEngine ) { -+ if ( engineData->uniEngine->canRender( &ch, 1 ) ) -+ return QFont::Unicode; -+ -+ } else { -+ if ( script != QFontPrivate::defaultScript && -+ QFontPrivate::defaultScript != QFont::Unicode && -+ QFontPrivate::defaultScript != QFont::UnknownScript ) { -+ QFontEngine *fe = engineForScript( QFontPrivate::defaultScript ); -+ -+ if ( fe->type() == QFontEngine::XLFD && fe->canRender( &ch, 1 ) ) -+ return QFontPrivate::defaultScript; -+ } -+ } -+ -+ return script; - } - - /*! -@@ -433,7 +492,7 @@ - */ - Qt::HANDLE QFont::handle() const - { -- QFontEngine *engine = d->engineForScript( QFontPrivate::defaultScript ); -+ QFontEngine *engine = d->m_engineForScript( QFontPrivate::defaultScript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -466,7 +525,7 @@ - */ - QString QFont::rawName() const - { -- QFontEngine *engine = d->engineForScript( QFontPrivate::defaultScript ); -+ QFontEngine *engine = d->m_engineForScript( QFontPrivate::defaultScript ); - #ifdef QT_CHECK_STATE - Q_ASSERT( engine != 0 ); - #endif // QT_CHECK_STATE -@@ -656,7 +715,7 @@ - return 0; - - QFont::Script script; -- SCRIPT_FOR_CHAR( script, ch ); -+ SCRIPT_FOR_CHAR( script, ch, d ); - - QFontEngine *engine = d->engineForScript( script ); - #ifdef QT_CHECK_STATE -@@ -690,7 +749,7 @@ - return 0; - - QFont::Script script; -- SCRIPT_FOR_CHAR( script, ch ); -+ SCRIPT_FOR_CHAR( script, ch, d ); - - int width; - -diff -ur qt-x11-free-3.2.3-fix/src-orig/kernel/qfontdata_p.h qt-x11-free-3.2.3-fix/src/kernel/qfontdata_p.h ---- qt-x11-free-3.2.3-fix/src-orig/kernel/qfontdata_p.h Mon Nov 10 19:21:58 2003 -+++ qt-x11-free-3.2.3-fix/src/kernel/qfontdata_p.h Fri Nov 28 20:44:37 2003 -@@ -125,6 +125,10 @@ - enum { widthCacheSize = 0x500 }; - uchar widthCache[widthCacheSize]; - #endif -+#ifdef Q_WS_X11 -+ uchar scripts_uniEngine[QFont::LastPrivateScript]; -+ QFontEngine *uniEngine; -+#endif // Q_WS_X11 - }; - - -@@ -154,6 +158,21 @@ - return engineData->engine; - #endif // Q_WS_X11 || Q_WS_WIN - } -+ -+ QFontEngine *m_engineForScript( QFont::Script script ) const { -+ if ( script == QFont::NoScript ) -+ script = QFontPrivate::defaultScript; -+ QFontEngine *engine = engineForScript( script ); -+#ifdef Q_WS_X11 -+ if ( engineData->scripts_uniEngine[script] ) -+ return engineData->uniEngine; -+#endif -+ return engine; -+ } -+ -+#ifdef Q_WS_X11 -+ QFont::Script checkSpecialScript( QFont::Script script, const QChar &ch ); -+#endif // Q_WS_X11 - - QFontDef request; - QFontEngineData *engineData; -diff -ur qt-x11-free-3.2.3-fix/src-orig/kernel/qfontdatabase_x11.cpp qt-x11-free-3.2.3-fix/src/kernel/qfontdatabase_x11.cpp ---- qt-x11-free-3.2.3-fix/src-orig/kernel/qfontdatabase_x11.cpp Mon Nov 10 19:21:59 2003 -+++ qt-x11-free-3.2.3-fix/src/kernel/qfontdatabase_x11.cpp Fri Nov 28 20:44:37 2003 -@@ -852,6 +852,7 @@ - } - } - #endif // QT_XFT2 -+ family->scripts[QFont::Unicode] = QtFontFamily::Supported; - - QCString file = file_value; - family->fontFilename = file; -diff -ur qt-x11-free-3.2.3-fix/src-orig/kernel/qtextengine.cpp qt-x11-free-3.2.3-fix/src/kernel/qtextengine.cpp ---- qt-x11-free-3.2.3-fix/src-orig/kernel/qtextengine.cpp Mon Nov 10 19:22:03 2003 -+++ qt-x11-free-3.2.3-fix/src/kernel/qtextengine.cpp Fri Nov 28 20:44:37 2003 -@@ -186,8 +186,7 @@ - if ( control.singleLine ) { - for ( int i = start; i <= stop; i++ ) { - -- unsigned short uc = text[i].unicode(); -- QFont::Script s = (QFont::Script)scriptForChar( uc ); -+ QFont::Script s = (QFont::Script)scriptForChar( text[i], engine->fnt ); - if (s == QFont::UnknownScript) - s = script; - -@@ -203,19 +202,19 @@ - for ( int i = start; i <= stop; i++ ) { - - unsigned short uc = text[i].unicode(); -- QFont::Script s = (QFont::Script)scriptForChar( uc ); -+ QFont::Script s = (QFont::Script)scriptForChar( text[i], engine->fnt ); - if (s == QFont::UnknownScript) - s = script; - - QChar::Category category = ::category( uc ); - if ( uc == 0xfffcU || uc == 0x2028U ) { - item.analysis.bidiLevel = level % 2 ? level-1 : level; -- item.analysis.script = QFont::Latin; -+ item.analysis.script = s; - item.isObject = TRUE; - s = QFont::NoScript; - } else if ((uc >= 9 && uc <=13) || - (category >= QChar::Separator_Space && category <= QChar::Separator_Paragraph)) { -- item.analysis.script = QFont::Latin; -+ item.analysis.script = s; - item.isSpace = TRUE; - item.isTab = ( uc == '\t' ); - item.analysis.bidiLevel = item.isTab ? control.baseLevel() : level; -diff -ur qt-x11-free-3.2.3-fix/src-orig/tools/qunicodetables_p.h qt-x11-free-3.2.3-fix/src/tools/qunicodetables_p.h ---- qt-x11-free-3.2.3-fix/src-orig/tools/qunicodetables_p.h Mon Nov 10 19:21:38 2003 -+++ qt-x11-free-3.2.3-fix/src/tools/qunicodetables_p.h Fri Nov 28 20:44:37 2003 -@@ -37,6 +37,7 @@ - #define QUNICODETABLES_P_H - - #include "qstring.h" -+#include "private/qfontdata_p.h" - - #ifdef QT_NO_UNICODETABLES - # include <ctype.h> -@@ -206,8 +207,9 @@ - return QUnicodeTables::line_break_info[pos]; - } - --inline int scriptForChar( ushort uc ) -+inline int scriptForChar( const QChar &ch, QFontPrivate *fnt = 0 ) - { -+ unsigned short uc = ch.unicode(); - unsigned char script = QUnicodeTables::scriptTable[(uc>>8)]; - if ( script >= QUnicodeTables::SCRIPTS_INDIC ) { - if ( script == QUnicodeTables::SCRIPTS_INDIC ) { -@@ -221,22 +223,18 @@ - script = QUnicodeTables::otherScripts[index]; - } - } -- return script; --} - - #ifdef Q_WS_X11 --#define SCRIPT_FOR_CHAR( script, c ) \ --do { \ -- unsigned short _uc = (c).unicode(); \ -- if ( _uc < 0x100 ) { \ -- script = QFont::Latin; \ -- } else { \ -- script = (QFont::Script)scriptForChar( _uc ); \ -- } \ --} while( FALSE ) -+ if ( fnt ) -+ script = fnt->checkSpecialScript( (QFont::Script)script, ch ); - #else --#define SCRIPT_FOR_CHAR( script, c ) \ -- script = (QFont::Script)scriptForChar( (c).unicode() ) --#endif -+ Q_UNUSED( fnt ); -+#endif // Q_WS_X11 -+ -+ return script; -+} -+ -+#define SCRIPT_FOR_CHAR( script, c, fnt ) \ -+ script = (QFont::Script)scriptForChar( c, fnt ) - - #endif diff --git a/x11-libs/qt/files/qt-3.3.1-mips-relax-branches.patch b/x11-libs/qt/files/qt-3.3.1-mips-relax-branches.patch deleted file mode 100644 index 3dc188fff326..000000000000 --- a/x11-libs/qt/files/qt-3.3.1-mips-relax-branches.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mkspecs/linux-g++/qmake.conf.orig 2004-04-29 14:39:16.000000000 -0400 -+++ mkspecs/linux-g++/qmake.conf 2004-04-17 04:20:23.000000000 -0400 -@@ -9,7 +9,7 @@ TEMPLATE = app - CONFIG += qt warn_on release incremental link_prl - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CC = gcc -+QMAKE_CC = gcc -Wa,-relax-branch - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -27,7 +27,7 @@ QMAKE_CFLAGS_SHLIB = -fPIC - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -D_REENTRANT - --QMAKE_CXX = g++ -+QMAKE_CXX = g++ -Wa,-relax-branch - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON diff --git a/x11-libs/qt/files/qt-3.3.1-qclipboard-fix.patch b/x11-libs/qt/files/qt-3.3.1-qclipboard-fix.patch deleted file mode 100644 index fdfa086ff13f..000000000000 --- a/x11-libs/qt/files/qt-3.3.1-qclipboard-fix.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- src/kernel/qclipboard_x11.cpp.sav 2004-01-06 19:24:40.000000000 +0100 -+++ src/kernel/qclipboard_x11.cpp 2004-01-22 19:48:32.000000000 +0100 -@@ -112,10 +112,6 @@ static bool pending_selection_changed = - - // event capture mechanism for qt_xclb_wait_for_event - static bool waiting_for_data = FALSE; --static bool has_captured_event = FALSE; --static Window capture_event_win = None; --static int capture_event_type = -1; --static XEvent captured_event; - - class QClipboardWatcher; // forward decl - static QClipboardWatcher *selection_watcher = 0; -@@ -432,69 +428,36 @@ bool QClipboard::selectionModeEnabled() - { return inSelectionMode_obsolete; } - - --// event filter function... captures interesting events while --// qt_xclb_wait_for_event is running the event loop --static int qt_xclb_event_filter(XEvent *event) --{ -- if (event->xany.type == capture_event_type && -- event->xany.window == capture_event_win) { -- VDEBUG( "QClipboard: event_filter(): caught event type %d", event->type ); -- has_captured_event = TRUE; -- captured_event = *event; -- return 1; -- } -- -- return 0; --} -- - bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event, - int timeout ) - { -- if ( waiting_for_data ) -- qFatal( "QClipboard: internal error, qt_xclb_wait_for_event recursed" ); -- -- waiting_for_data = TRUE; -- - QTime started = QTime::currentTime(); - QTime now = started; -- -- has_captured_event = FALSE; -- capture_event_win = win; -- capture_event_type = type; -- -- QX11EventFilter old_event_filter = qt_set_x11_event_filter(qt_xclb_event_filter); -+ bool flushed = FALSE; - - do { -- if ( XCheckTypedWindowEvent(dpy,win,type,event) ) { -- waiting_for_data = FALSE; -- qt_set_x11_event_filter(old_event_filter); -+ if ( XCheckTypedWindowEvent(dpy,win,type,event) ) - return TRUE; -- } - - now = QTime::currentTime(); - if ( started > now ) // crossed midnight - started = now; - -- // 0x08 == ExcludeTimers for X11 only -- qApp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput | -- QEventLoop::ExcludeSocketNotifiers | -- QEventLoop::WaitForMore | 0x08 ); -- -- if ( has_captured_event ) { -- waiting_for_data = FALSE; -- *event = captured_event; -- qt_set_x11_event_filter(old_event_filter); -- return TRUE; -+ if(!flushed) { -+ XFlush( dpy ); -+ flushed = TRUE; - } -- } while ( started.msecsTo(now) < timeout ); - -- waiting_for_data = FALSE; -- qt_set_x11_event_filter(old_event_filter); -+ // sleep 50ms, so we don't use up CPU cycles all the time. -+ struct timeval usleep_tv; -+ usleep_tv.tv_sec = 0; -+ usleep_tv.tv_usec = 50000; -+ select(0, 0, 0, 0, &usleep_tv); -+ } while ( started.msecsTo(now) < timeout ); - - return FALSE; - } - -- - static inline int maxSelectionIncr( Display *dpy ) - { return XMaxRequestSize(dpy) > 65536 ? 65536*4 : XMaxRequestSize(dpy)*4 - 100; } - diff --git a/x11-libs/qt/files/qt-3.3.2-immodule-20040819.patch b/x11-libs/qt/files/qt-3.3.2-immodule-20040819.patch deleted file mode 100644 index d377c5436e25..000000000000 --- a/x11-libs/qt/files/qt-3.3.2-immodule-20040819.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: src/kernel/qapplication_x11.cpp -=================================================================== ---- src/kernel/qapplication_x11.cpp (.../vendor/qt-x11-free) (revision 92) -+++ src/kernel/qapplication_x11.cpp (.../immodule-qt-x11/trunk) (revision 92) -@@ -1026,13 +1057,31 @@ - settings.readEntry( "/qt/XIMInputStyle", - QObject::trUtf8( "On The Spot" ) ).lower(); - if ( ximInputStyle == "on the spot" ) -- xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing; -+ qt_xim_preferred_style = XIMPreeditCallbacks | XIMStatusNothing; - else if ( ximInputStyle == "over the spot" ) -- xim_preferred_style = XIMPreeditPosition | XIMStatusNothing; -+ qt_xim_preferred_style = XIMPreeditPosition | XIMStatusNothing; - else if ( ximInputStyle == "off the spot" ) -- xim_preferred_style = XIMPreeditArea | XIMStatusArea; -+ qt_xim_preferred_style = XIMPreeditArea | XIMStatusArea; - else if ( ximInputStyle == "root" ) -- xim_preferred_style = XIMPreeditNothing | XIMStatusNothing; -+ qt_xim_preferred_style = XIMPreeditNothing | XIMStatusNothing; -+ -+ /* -+ The identifier name of an input method is acquired from the -+ configuration file as a default. If a environment variable -+ "QT_IM_SWITCHER" is not empty it will overwrite the -+ configuration file. The "imsw-multi" becomes the default if the entry -+ is not configured. -+ */ -+ if ( getenv( "QT_IM_SWITCHER" ) ) -+ defaultIM = getenv( "QT_IM_SWITCHER" ); -+ else -+ defaultIM = settings.readEntry( "/qt/DefaultInputMethodSwitcher", "imsw-multi" ); -+ -+ // defaultIM is restricted to be an IM-switcher. An IM-switcher -+ // has a 'imsw-' prefix -+ if ( defaultIM.find( "imsw-" ) != 0 ) { -+ defaultIM = "imsw-multi"; -+ } - #endif - - if (update_timestamp) { diff --git a/x11-libs/qt/files/qt-3.3.2-mips-relax-branches.patch b/x11-libs/qt/files/qt-3.3.2-mips-relax-branches.patch deleted file mode 100644 index 3dc188fff326..000000000000 --- a/x11-libs/qt/files/qt-3.3.2-mips-relax-branches.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mkspecs/linux-g++/qmake.conf.orig 2004-04-29 14:39:16.000000000 -0400 -+++ mkspecs/linux-g++/qmake.conf 2004-04-17 04:20:23.000000000 -0400 -@@ -9,7 +9,7 @@ TEMPLATE = app - CONFIG += qt warn_on release incremental link_prl - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CC = gcc -+QMAKE_CC = gcc -Wa,-relax-branch - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -27,7 +27,7 @@ QMAKE_CFLAGS_SHLIB = -fPIC - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -D_REENTRANT - --QMAKE_CXX = g++ -+QMAKE_CXX = g++ -Wa,-relax-branch - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON diff --git a/x11-libs/qt/qt-3.2.3-r1.ebuild b/x11-libs/qt/qt-3.2.3-r1.ebuild deleted file mode 100644 index e4022f9a3897..000000000000 --- a/x11-libs/qt/qt-3.2.3-r1.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.2.3-r1.ebuild,v 1.12 2005/01/08 10:36:27 eradicator Exp $ - -inherit eutils toolchain-funcs - -SRCTYPE="free" -DESCRIPTION="QT version ${PV}" -HOMEPAGE="http://www.trolltech.com/" -SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2" - -LICENSE="|| ( QPL-1.0 GPL-2 )" -SLOT="3" -KEYWORDS="x86 hppa amd64 sparc ia64 alpha ppc" -IUSE="cups nas postgres opengl mysql odbc gif doc xinerama cjk debug" - -DEPEND="virtual/x11 - media-libs/libpng - media-libs/lcms - media-libs/jpeg - media-libs/libmng - >=media-libs/freetype-2 - virtual/xft - !<kde-base/kdelibs-3.1.4 - nas? ( media-libs/nas ) - odbc? ( dev-db/unixODBC ) - mysql? ( dev-db/mysql ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/postgresql )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} - -QTBASE=/usr/qt/3 -export QTDIR=${S} - -src_unpack() { - unpack ${A} - - export QTDIR=${S} - cd ${S} - - use cjk && epatch ${FILESDIR}/${P}-qfontdatabase-i18n-20031024.patch - use cjk && epatch ${FILESDIR}/${P}-qpsprinter-useFreeType2-20031128.patch - use cjk && epatch ${FILESDIR}/${P}-scriptForChar-20031128.patch - - cp configure configure.orig - sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure - - cd mkspecs/linux-g++ - # use env's $CC, $CXX - if [ -n "$(tc-getCCX)" ]; then - einfo 'Using environment definition of $CXX' - cp qmake.conf qmake.conf.orig - sed -e "s:= g++:= ${CXX}:" qmake.conf.orig > qmake.conf - fi - if [ -n "$(tc-getCC)" ]; then - einfo 'Using environment definition of $CC' - cp qmake.conf qmake.conf.orig - sed -e "s:= gcc:= ${CC}:" qmake.conf.orig > qmake.conf - fi - - # alpha people, please review the following - - # on alpha we need to compile everything with -fPIC - if [ ${ARCH} == "alpha" ]; then - cp qmake.conf qmake.conf.orig - sed -e "s:= -O2:= -O2 -fPIC:" qmake.conf.orig > qmake.conf - cat >> ${S}/tools/designer/editor/editor.pro <<_EOF_ -QMAKE_CFLAGS += -fPIC -QMAKE_CXXFLAGS += -fPIC -_EOF_ - fi - - cd ${S} -} - -src_compile() { - export QTDIR=${S} - export SYSCONF=${D}${QTBASE}/etc/settings - LD_LIBRARY_PATH_OLD=${LD_LIBRARY_PATH} - export LD_LIBRARY_PATH=${S}/lib:${LD_LIBRARY_PATH} - - # fix #11144; qt wants to create lock files etc. in that directory - addwrite "${QTBASE}/etc/settings" - addwrite "$HOME/.qt" - dodir ${QTBASE}/etc/settings - - export LDFLAGS="-ldl" - - use cups || myconf="${myconf} -no-cups" - use nas && myconf="${myconf} -system-nas-sound" - use gif && myconf="${myconf} -qt-gif" - use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql" - use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql/server -I/usr/include/postgresql/pgsql" - use odbc && myconf="${myconf} -plugin-sql-odbc" - use opengl && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl" - use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions" - use xinerama && myconf="${myconf} -xinerama" - - export YACC='byacc -d' - - ./configure -sm -thread -stl -system-zlib -system-libjpeg -verbose \ - -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ - -system-libpng -ldl -lpthread -xft -platform linux-g++ -xplatform \ - linux-g++ -xrender -prefix ${D}${QTBASE} -plugindir ${QTBASE}/plugins \ - -docdir ${QTBASE}/doc -translationdir ${QTBASE}/translations \ - -datadir ${QTBASE} -sysconfdir ${QTBASE}/etc/settings -fast ${myconf} || die - - export QTDIR=${S} - emake src-qmake src-moc sub-src sub-tools || die - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH_OLD} -} - -src_install() { - export QTDIR=${S} - - # binaries - into $QTBASE - dobin bin/* - - # libraries - dolib lib/libqt-mt.so.3.2.3 lib/libqui.so.1.0.0 lib/lib{editor,qassistantclient,designercore}.a - cd ${D}/$QTBASE/lib - for x in libqui.so ; do - ln -s $x.1.0.0 $x.1.0 - ln -s $x.1.0 $x.1 - ln -s $x.1 $x - done - - # version symlinks - 3.2.1->3.2->3->.so - ln -s libqt-mt.so.3.2.3 libqt-mt.so.3.2 - ln -s libqt-mt.so.3.2 libqt-mt.so.3 - ln -s libqt-mt.so.3 libqt-mt.so - - # libqt -> libqt-mt symlinks - ln -s libqt-mt.so.3.2.3 libqt.so.3.2.3 - ln -s libqt-mt.so.3.2 libqt.so.3.2 - ln -s libqt-mt.so.3 libqt.so.3 - ln -s libqt-mt.so libqt.so - - # includes - cd ${S} - dodir ${QTBASE}/include/private - cp include/* ${D}/${QTBASE}/include/ - cp include/private/* ${D}/${QTBASE}/include/private/ - - # misc - insinto /etc/env.d - doins ${FILESDIR}/{45qt3,50qtdir3} - - dodir ${QTBASE}/tools/designer/templates - cd ${S} - cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates - - dodir ${QTBASE}/translations - cd ${S} - cp translations/* ${D}/${QTBASE}/translations - - dodir ${QTBASE}/doc - - if use doc; then - cp -r ${S}/doc ${D}/${QTBASE} - cp -r ${S}/examples ${D}/${QTBASE} - cp -r ${S}/tutorial ${D}/${QTBASE} - fi - - # misc build reqs - dodir ${QTBASE}/mkspecs - cp -R ${S}/mkspecs/linux-g++ ${D}/${QTBASE}/mkspecs/ - - sed -e "s:${S}:${QTBASE}:g" \ - ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache - - # plugins - cd ${S} - plugins=`find plugins -name "lib*.so" -print` - for x in $plugins; do - insinto ${QTBASE}/`dirname $x` - doins $x - done -} diff --git a/x11-libs/qt/qt-3.3.2.ebuild b/x11-libs/qt/qt-3.3.2.ebuild deleted file mode 100644 index d4f10493f28e..000000000000 --- a/x11-libs/qt/qt-3.3.2.ebuild +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.2.ebuild,v 1.20 2005/01/08 10:36:27 eradicator Exp $ - -inherit eutils - -SRCTYPE="free" -DESCRIPTION="QT version ${PV}" -HOMEPAGE="http://www.trolltech.com/" - -IMMQT_P="qt-x11-immodule-unified-qt3.3.3-20040819" - -SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2 - immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz ) - immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz )" - -LICENSE="|| (QPL-1.0 GPL-2 )" -SLOT="3" -KEYWORDS="x86 alpha ppc amd64 sparc hppa ~mips ppc64" -IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc" - -DEPEND="virtual/x11 virtual/xft - media-libs/libpng media-libs/jpeg media-libs/libmng - >=media-libs/freetype-2 - gif? ( media-libs/giflib media-libs/libungif ) - nas? ( >=media-libs/nas-1.5 ) - odbc? ( dev-db/unixODBC ) - mysql? ( dev-db/mysql ) - sqlite? ( =dev-db/sqlite-2* ) - firebird? ( dev-db/firebird ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/postgresql ) - cups? ( net-print/cups ) - zlib? ( sys-libs/zlib ) - icc? ( dev-lang/icc )" - -# old immodules may cause segfaults on some qt applications, -# especially qtconfig -PDEPEND="!<app-i18n/scim-qtimm-0.7 - !<app-i18n/uim-qt-0.1.7 - !>=app-i18n/uim-qt-0.1.9" - -S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} - -QTBASE=/usr/qt/3 -export QTDIR=${S} -export PLATFORM=linux-g++ - -pkg_setup() { - if use immqt ; then - ewarn - ewarn "You are going to compile binary imcompatible immodule for Qt. This means" - ewarn "you have to recompile everything depending on Qt after you install it." - ewarn "Be aware." - ewarn - fi -} - -src_unpack() { - unpack ${A} - - export QTDIR=${S} - cd ${S} - - cp configure configure.orig - sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure - - epatch ${FILESDIR}/qt-no-rpath-uic.patch - - if use immqt || use immqt-bc ; then - einfo "Applying ${IMMQT_P}.... Please ignore an error on qapplication_x11.cpp." - patch -p0 -g0 -s < ../${IMMQT_P}.diff - patch -p0 -g0 -s < ${FILESDIR}/qt-3.3.2-immodule-20040819.patch - patch -p0 -g0 -s < ${FILESDIR}/qt-3.3.3-immodule-20040819-event-inversion-20040908.diff - - patch -p0 -g0 -s < ${FILESDIR}/qt-3.3.3-immodule-r123-event-inversion-20040909.diff - sh make-symlinks.sh || die "make symlinks failed" - fi - - # mips requires this patch to pass a CFLAG to gcc/g++ (which passes it to the assembler). - # It tells the assembler to relax branches on mips, otherwise we get build errors. - use mips && epatch ${FILESDIR}/${P}-mips-relax-branches.patch - -# use icc && export PLATFORM=linux-icc -} - -src_compile() { - export QTDIR=${S} - export SYSCONF=${D}${QTBASE}/etc/settings - - # Let's just allow writing to these directories during Qt emerge - # as it makes Qt much happier. - addwrite "${QTBASE}/etc/settings" - addwrite "$HOME/.qt" - - use nas && myconf="${myconf} -system-nas-sound" - use gif && myconf="${myconf} -qt-gif" - use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql" || myconf="${myconf} -no-sql-mysql" - use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql" - use firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase" -# use oci8 && myconf="${myconf} -plugin-sql-oci" || myconf="${myconf} -no-sql-oci" - use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite" - use odbc && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc" - use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups" - use opengl && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl" - use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions" - use xinerama && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama" - use zlib && myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib" - use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6" - use immqt-bc && myconf="${myconf} -im" - use immqt && myconf="${myconf} -im -im-ext" - - export YACC='byacc -d' - - ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ - -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ - -system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \ - ${PLATFORM} -xrender -prefix ${QTBASE} -fast ${myconf} \ - -dlopen-opengl || die - - export QTDIR=${S} - - emake src-qmake src-moc sub-src || die - LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die -} - -src_install() { - export QTDIR=${S} - - # binaries - into $QTBASE - dobin bin/* - - # libraries - - dolib lib/libqt-mt.so.3.3.2 lib/libqui.so.1.0.0 - dolib lib/lib{editor,qassistantclient,designercore}.a lib/libqt-mt.la - - cd ${D}/$QTBASE/lib - for x in libqui.so ; do - ln -s $x.1.0.0 $x.1.0 - ln -s $x.1.0 $x.1 - ln -s $x.1 $x - done - - # version symlinks - 3.3.1->3.3->3->.so - ln -s libqt-mt.so.3.3.2 libqt-mt.so.3.3 - ln -s libqt-mt.so.3.3 libqt-mt.so.3 - ln -s libqt-mt.so.3 libqt-mt.so - - # libqt -> libqt-mt symlinks - ln -s libqt-mt.so.3.3.2 libqt.so.3.3.2 - ln -s libqt-mt.so.3.3 libqt.so.3.3 - ln -s libqt-mt.so.3 libqt.so.3 - ln -s libqt-mt.so libqt.so - - # includes - cd ${S} - dodir ${QTBASE}/include/private - cp include/* ${D}/${QTBASE}/include/ - cp include/private/* ${D}/${QTBASE}/include/private/ - - # misc - insinto /etc/env.d - doins ${FILESDIR}/{45qt3,50qtdir3} - - dodir ${QTBASE}/tools/designer/templates - cd ${S} - cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates - - dodir ${QTBASE}/translations - cd ${S} - cp translations/* ${D}/${QTBASE}/translations - - dodir ${QTBASE}/etc - keepdir ${QTBASE}/etc/settings - - dodir ${QTBASE}/doc - - if use doc; then - cp -r ${S}/doc ${D}/${QTBASE} - - cd ${S}/examples - find . -name Makefile | while read MAKEFILE - do - cp ${MAKEFILE} ${MAKEFILE}.old - sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE} - rm -f ${MAKEFILE}.old - done - - cp -r ${S}/examples ${D}/${QTBASE} - - cd ${S}/tutorial - find . -name Makefile | while read MAKEFILE - do - cp ${MAKEFILE} ${MAKEFILE}.old - sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE} - rm -f ${MAKEFILE}.old - done - - cp -r ${S}/tutorial ${D}/${QTBASE} - fi - - if use immqt || use immqt-bc ; then - dodoc ${S}/README.immodule - fi - - # misc build reqs - dodir ${QTBASE}/mkspecs - cp -R ${S}/mkspecs/${PLATFORM} ${D}/${QTBASE}/mkspecs/ - - sed -e "s:${S}:${QTBASE}:g" \ - ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache - - # plugins - cd ${S} - plugins=`find plugins -name "lib*.so" -print` - for x in $plugins; do - insinto ${QTBASE}/`dirname $x` - doins $x - done - - # needed to fix lib64 issues on amd64, see bug #45669 - use amd64 && ln -s ${QTBASE}/lib ${D}/${QTBASE}/lib64 -} diff --git a/x11-libs/qt/qt-3.3.3-r2.ebuild b/x11-libs/qt/qt-3.3.3-r2.ebuild deleted file mode 100644 index 1ee4de5ea1d2..000000000000 --- a/x11-libs/qt/qt-3.3.3-r2.ebuild +++ /dev/null @@ -1,273 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r2.ebuild,v 1.3 2005/01/18 05:11:08 eradicator Exp $ - -inherit eutils flag-o-matic - -SRCTYPE="free" -DESCRIPTION="QT version ${PV}" -HOMEPAGE="http://www.trolltech.com/" - -IMMQT_P="qt-x11-immodule-unified-qt3.3.3-20040910" - -SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2 - immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz ) - immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz ) - ppc-macos? ( http://dev.gentoo.org/~usata/distfiles/${P}-darwin-fink.patch.gz )" - -LICENSE="|| ( QPL-1.0 GPL-2 )" -SLOT="3" -#KEYWORDS="~x86 ~alpha ~ppc amd64 ~sparc ~hppa ~mips ~ppc64 ~ia64 ~ppc-macos" -#-r2 is the same as -r1 but with multilib fixes -KEYWORDS="amd64 ~hppa ~mips ~ppc64 ~sparc" -IUSE="cups debug doc firebird gif icc ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc" - -DEPEND="virtual/x11 virtual/xft - media-libs/libpng media-libs/jpeg media-libs/libmng - >=media-libs/freetype-2 - gif? ( media-libs/giflib media-libs/libungif ) - nas? ( >=media-libs/nas-1.5 ) - odbc? ( dev-db/unixODBC ) - mysql? ( dev-db/mysql ) - sqlite? ( =dev-db/sqlite-2* ) - firebird? ( dev-db/firebird ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/postgresql ) - cups? ( net-print/cups ) - zlib? ( sys-libs/zlib ) - icc? ( dev-lang/icc )" - -# old immodules may cause segfaults on some qt applications, -# especially qtconfig -PDEPEND="!<=app-i18n/scim-qtimm-0.7 - !<=app-i18n/uim-qt-0.1.7" - -S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} - -QTBASE=/usr/qt/3 -export QTDIR=${S} - -pkg_setup() { - if use immqt ; then - ewarn - ewarn "You are going to compile binary imcompatible immodule for Qt. This means" - ewarn "you have to recompile everything depending on Qt after you install it." - ewarn "Be aware." - ewarn - fi - - if useq ppc-macos ; then - export PLATFORM=darwin-g++ - export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" - export INSTALL_ROOT="" - else - export PLATFORM=linux-g++ - #use icc && export PLATFORM=linux-icc - fi -} - -src_unpack() { - unpack ${A} - - export QTDIR=${S} - cd ${S} - - cp configure configure.orig - sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure - - epatch ${FILESDIR}/qt-no-rpath-uic.patch - - if use immqt || use immqt-bc ; then - epatch ../${IMMQT_P}.diff - sh make-symlinks.sh || die "make symlinks failed" - fi - - if use ppc-macos ; then - gzcat ${FILESDIR}/${P}-darwin-fink.patch.gz | sed -e "s:@QTBASE@:${QTBASE}:g" > ${T}/${P}-darwin-fink.patch - epatch ${T}/${P}-darwin-fink.patch - fi - - cd mkspecs/${PLATFORM} - # set c/xxflags and ldflags - strip-flags - sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ - -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ - qmake.conf || die - cd ${S} -} - -src_compile() { - export QTDIR=${S} - export SYSCONF=${D}${QTBASE}/etc/settings - - # Let's just allow writing to these directories during Qt emerge - # as it makes Qt much happier. - addwrite "${QTBASE}/etc/settings" - addwrite "$HOME/.qt" - - use nas && myconf="${myconf} -system-nas-sound" - use gif && myconf="${myconf} -qt-gif" - use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql" || myconf="${myconf} -no-sql-mysql" - use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql" - use firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase" - use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite" - use odbc && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc" - use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups" - use opengl && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl" - use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions" - use xinerama && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama" - use zlib && myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib" - use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6" - use immqt-bc && myconf="${myconf} -inputmethod" - use immqt && myconf="${myconf} -inputmethod -inputmethod-ext" - - if use ppc-macos ; then - myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-cups -lresolv -shared" - myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib" - myconf="${myconf} -L${S}/lib -I${S}/include" - sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die - fi - - export YACC='byacc -d' - - ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ - -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ - -system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \ - ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \ - -fast ${myconf} -dlopen-opengl || die - - export QTDIR=${S} - - emake src-qmake src-moc sub-src || die - DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" \ - LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die -} - -src_install() { - export QTDIR=${S} - - # binaries - into $QTBASE - dobin bin/* - - # libraries - if use ppc-macos; then - # dolib is broken on BSD because of missing readlink(1) - dodir ${QTBASE}/$(get_libdir) - cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die - - cd ${D}/${QTBASE}/$(get_libdir) - for lib in libqt-mt* ; do - ln -s ${lib} ${lib/-mt/} - done - else - dolib lib/lib{editor,qassistantclient,designercore}.a - dolib lib/libqt-mt.la - dolib lib/libqt-mt.so.3.3.3 lib/libqui.so.1.0.0 - cd ${D}/${QTBASE}/$(get_libdir) - - for x in libqui.so ; do - ln -s $x.1.0.0 $x.1.0 - ln -s $x.1.0 $x.1 - ln -s $x.1 $x - done - - # version symlinks - 3.3.3->3.3->3->.so - ln -s libqt-mt.so.3.3.3 libqt-mt.so.3.3 - ln -s libqt-mt.so.3.3 libqt-mt.so.3 - ln -s libqt-mt.so.3 libqt-mt.so - - # libqt -> libqt-mt symlinks - ln -s libqt-mt.so.3.3.3 libqt.so.3.3.3 - ln -s libqt-mt.so.3.3 libqt.so.3.3 - ln -s libqt-mt.so.3 libqt.so.3 - ln -s libqt-mt.so libqt.so - fi - - # plugins - cd ${S} - plugins=`find plugins -name "lib*.so" -print` - for x in $plugins; do - exeinto ${QTBASE}/`dirname $x` - doexe $x - done - - # Past this point just needs to be done once - is_final_abi || return 0 - - # includes - cd ${S} - dodir ${QTBASE}/include/private - cp include/* ${D}/${QTBASE}/include/ - cp include/private/* ${D}/${QTBASE}/include/private/ - - # misc - insinto /etc/env.d - doins ${FILESDIR}/{45qt3,50qtdir3} - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${QTBASE}/${libdir}" - done - dosed "s~^LDPATH=.*$~LDPATH=${libdirs:1}~" /etc/env.d/45qt3 - - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib - fi - - dodir ${QTBASE}/tools/designer/templates - cd ${S} - cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates - - dodir ${QTBASE}/translations - cd ${S} - cp translations/* ${D}/${QTBASE}/translations - - dodir ${QTBASE}/etc - keepdir ${QTBASE}/etc/settings - - dodir ${QTBASE}/doc - - if use doc; then - cp -r ${S}/doc ${D}/${QTBASE} - - cd ${S}/examples - find . -name Makefile | while read MAKEFILE - do - cp ${MAKEFILE} ${MAKEFILE}.old - sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE} - rm -f ${MAKEFILE}.old - done - - cp -r ${S}/examples ${D}/${QTBASE} - - cd ${S}/tutorial - find . -name Makefile | while read MAKEFILE - do - cp ${MAKEFILE} ${MAKEFILE}.old - sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE} - rm -f ${MAKEFILE}.old - done - - cp -r ${S}/tutorial ${D}/${QTBASE} - fi - - if use immqt || use immqt-bc ; then - dodoc ${S}/README.immodule - fi - - # misc build reqs - dodir ${QTBASE}/mkspecs - cp -R ${S}/mkspecs/${PLATFORM} ${D}/${QTBASE}/mkspecs/ - - sed -e "s:${S}:${QTBASE}:g" \ - ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache - - if use ppc-macos ; then - dosed "s:linux-g++:${PLATFORM}:" /etc/env.d/45qt3 \ - "s:\$(QTBASE):\$(QTDIR):g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf \ - "s:${S}:${QTBASE}:g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf ${QTBASE}/lib/libqt-mt.la || die - fi -} diff --git a/x11-libs/qt/qt-3.3.3-r3.ebuild b/x11-libs/qt/qt-3.3.3-r3.ebuild deleted file mode 100644 index 04bf8778bbe3..000000000000 --- a/x11-libs/qt/qt-3.3.3-r3.ebuild +++ /dev/null @@ -1,280 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.3-r3.ebuild,v 1.1 2005/01/24 11:10:04 greg_g Exp $ - -inherit eutils flag-o-matic - -SRCTYPE="free" -DESCRIPTION="QT version ${PV}" -HOMEPAGE="http://www.trolltech.com/" - -IMMQT_P="qt-x11-immodule-unified-qt3.3.3-20040910" - -SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2 - immqt? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz ) - immqt-bc? ( http://freedesktop.org/Software/ImmoduleQtDownload/${IMMQT_P}.diff.gz ) - ppc-macos? ( http://dev.gentoo.org/~usata/distfiles/${P}-darwin-fink.patch.gz )" - -LICENSE="|| ( QPL-1.0 GPL-2 )" -SLOT="3" -#KEYWORDS="~x86 ~alpha ~ppc amd64 ~sparc ~hppa ~mips ~ppc64 ~ia64 ~ppc-macos" -#-r2 is the same as -r1 but with multilib fixes -KEYWORDS="~x86 ~amd64 ~hppa ~mips ~ppc64 ~sparc" -IUSE="cups debug doc firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc" - -DEPEND="virtual/x11 virtual/xft - media-libs/libpng media-libs/jpeg media-libs/libmng - >=media-libs/freetype-2 - nas? ( >=media-libs/nas-1.5 ) - odbc? ( dev-db/unixODBC ) - mysql? ( dev-db/mysql ) - sqlite? ( =dev-db/sqlite-2* ) - firebird? ( dev-db/firebird ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/postgresql ) - cups? ( net-print/cups ) - zlib? ( sys-libs/zlib )" - -# old immodules may cause segfaults on some qt applications, -# especially qtconfig -PDEPEND="!<=app-i18n/scim-qtimm-0.7 - !<=app-i18n/uim-qt-0.1.7" - -S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} - -QTBASE=/usr/qt/3 -export QTDIR=${S} - -pkg_setup() { - if use immqt ; then - ewarn - ewarn "You are going to compile binary imcompatible immodule for Qt. This means" - ewarn "you have to recompile everything depending on Qt after you install it." - ewarn "Be aware." - ewarn - fi - - if useq ppc-macos ; then - export PLATFORM=darwin-g++ - export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" - export INSTALL_ROOT="" - else - export PLATFORM=linux-g++ - fi -} - -src_unpack() { - unpack ${A} - - export QTDIR=${S} - cd ${S} - - cp configure configure.orig - sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure - - epatch ${FILESDIR}/qt-no-rpath-uic.patch - - # fix fullscreen mode for 64 bit archs (kde bug 92992) - epatch ${FILESDIR}/${P}-amd64-fullscreen.patch - - # fix freeze caused by bad interaction with kde klipper (kde bug 80072) - epatch ${FILESDIR}/${P}-qclipboard-hack.patch - - # performance patches (see http://robotics.dei.unipd.it/~koral/KDE/kflicker.html) - epatch ${FILESDIR}/${P}-flickerfree_qiconview_buffered.patch - epatch ${FILESDIR}/${P}-flickerfree_qscrollview_fixwindowactivate.patch - - if use immqt || use immqt-bc ; then - epatch ../${IMMQT_P}.diff - sh make-symlinks.sh || die "make symlinks failed" - fi - - if use ppc-macos ; then - gzcat ${FILESDIR}/${P}-darwin-fink.patch.gz | sed -e "s:@QTBASE@:${QTBASE}:g" > ${T}/${P}-darwin-fink.patch - epatch ${T}/${P}-darwin-fink.patch - fi - - cd mkspecs/${PLATFORM} - # set c/xxflags and ldflags - strip-flags - sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ - -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ - qmake.conf || die - cd ${S} -} - -src_compile() { - export QTDIR=${S} - export SYSCONF=${D}${QTBASE}/etc/settings - - # Let's just allow writing to these directories during Qt emerge - # as it makes Qt much happier. - addwrite "${QTBASE}/etc/settings" - addwrite "$HOME/.qt" - - use nas && myconf="${myconf} -system-nas-sound" - use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif" - use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql" || myconf="${myconf} -no-sql-mysql" - use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql" - use firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase" - use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite" - use odbc && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc" - use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups" - use opengl && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl" - use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions" - use xinerama && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama" - use zlib && myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib" - use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6" - use immqt-bc && myconf="${myconf} -inputmethod" - use immqt && myconf="${myconf} -inputmethod -inputmethod-ext" - - if use ppc-macos ; then - myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-cups -lresolv -shared" - myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib" - myconf="${myconf} -L${S}/lib -I${S}/include" - sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die - fi - - export YACC='byacc -d' - - ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ - -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ - -system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \ - ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \ - -fast ${myconf} -dlopen-opengl || die - - export QTDIR=${S} - - emake src-qmake src-moc sub-src || die - DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" \ - LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die -} - -src_install() { - export QTDIR=${S} - - # binaries - into $QTBASE - dobin bin/* - - # libraries - if use ppc-macos; then - # dolib is broken on BSD because of missing readlink(1) - dodir ${QTBASE}/$(get_libdir) - cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die - - cd ${D}/${QTBASE}/$(get_libdir) - for lib in libqt-mt* ; do - ln -s ${lib} ${lib/-mt/} - done - else - dolib lib/lib{editor,qassistantclient,designercore}.a - dolib lib/libqt-mt.la - dolib lib/libqt-mt.so.3.3.3 lib/libqui.so.1.0.0 - cd ${D}/${QTBASE}/$(get_libdir) - - for x in libqui.so ; do - ln -s $x.1.0.0 $x.1.0 - ln -s $x.1.0 $x.1 - ln -s $x.1 $x - done - - # version symlinks - 3.3.3->3.3->3->.so - ln -s libqt-mt.so.3.3.3 libqt-mt.so.3.3 - ln -s libqt-mt.so.3.3 libqt-mt.so.3 - ln -s libqt-mt.so.3 libqt-mt.so - - # libqt -> libqt-mt symlinks - ln -s libqt-mt.so.3.3.3 libqt.so.3.3.3 - ln -s libqt-mt.so.3.3 libqt.so.3.3 - ln -s libqt-mt.so.3 libqt.so.3 - ln -s libqt-mt.so libqt.so - fi - - # plugins - cd ${S} - plugins=`find plugins -name "lib*.so" -print` - for x in $plugins; do - exeinto ${QTBASE}/`dirname $x` - doexe $x - done - - # Past this point just needs to be done once - is_final_abi || return 0 - - # includes - cd ${S} - dodir ${QTBASE}/include/private - cp include/* ${D}/${QTBASE}/include/ - cp include/private/* ${D}/${QTBASE}/include/private/ - - # misc - insinto /etc/env.d - doins ${FILESDIR}/{45qt3,50qtdir3} - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${QTBASE}/${libdir}" - done - dosed "s~^LDPATH=.*$~LDPATH=${libdirs:1}~" /etc/env.d/45qt3 - - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib - fi - - dodir ${QTBASE}/tools/designer/templates - cd ${S} - cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates - - dodir ${QTBASE}/translations - cd ${S} - cp translations/* ${D}/${QTBASE}/translations - - dodir ${QTBASE}/etc - keepdir ${QTBASE}/etc/settings - - dodir ${QTBASE}/doc - - if use doc; then - cp -r ${S}/doc ${D}/${QTBASE} - - cd ${S}/examples - find . -name Makefile | while read MAKEFILE - do - cp ${MAKEFILE} ${MAKEFILE}.old - sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE} - rm -f ${MAKEFILE}.old - done - - cp -r ${S}/examples ${D}/${QTBASE} - - cd ${S}/tutorial - find . -name Makefile | while read MAKEFILE - do - cp ${MAKEFILE} ${MAKEFILE}.old - sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE} - rm -f ${MAKEFILE}.old - done - - cp -r ${S}/tutorial ${D}/${QTBASE} - fi - - if use immqt || use immqt-bc ; then - dodoc ${S}/README.immodule - fi - - # misc build reqs - dodir ${QTBASE}/mkspecs - cp -R ${S}/mkspecs/${PLATFORM} ${D}/${QTBASE}/mkspecs/ - - sed -e "s:${S}:${QTBASE}:g" \ - ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache - - if use ppc-macos ; then - dosed "s:linux-g++:${PLATFORM}:" /etc/env.d/45qt3 \ - "s:\$(QTBASE):\$(QTDIR):g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf \ - "s:${S}:${QTBASE}:g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf ${QTBASE}/lib/libqt-mt.la || die - fi -} diff --git a/x11-libs/qt/qt-3.3.4-r1.ebuild b/x11-libs/qt/qt-3.3.4-r1.ebuild deleted file mode 100644 index bbf9dc665a99..000000000000 --- a/x11-libs/qt/qt-3.3.4-r1.ebuild +++ /dev/null @@ -1,273 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r1.ebuild,v 1.1 2005/01/31 16:54:26 caleb Exp $ - -inherit eutils flag-o-matic - -SRCTYPE="free" -DESCRIPTION="QT version ${PV}" -HOMEPAGE="http://www.trolltech.com/" - -IMMQT_P="qt-x11-immodule-unified-qt3.3.4-20041203" - -SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2 - immqt? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 ) - immqt-bc? ( http://freedesktop.org/~daisuke/${IMMQT_P}.diff.bz2 )" -# ppc-macos? ( http://dev.gentoo.org/~usata/distfiles/${P}-darwin-fink.patch.gz )" - -LICENSE="|| ( QPL-1.0 GPL-2 )" -SLOT="3" -KEYWORDS="~x86 ~amd64 ~hppa ~mips ~ppc64 ~sparc" -IUSE="cups debug doc firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama zlib immqt immqt-bc" - -DEPEND="virtual/x11 virtual/xft - media-libs/libpng media-libs/jpeg media-libs/libmng - >=media-libs/freetype-2 - nas? ( >=media-libs/nas-1.5 ) - odbc? ( dev-db/unixODBC ) - mysql? ( dev-db/mysql ) - sqlite? ( =dev-db/sqlite-2* ) - firebird? ( dev-db/firebird ) - opengl? ( virtual/opengl virtual/glu ) - postgres? ( dev-db/postgresql ) - cups? ( net-print/cups ) - zlib? ( sys-libs/zlib )" - -S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} - -QTBASE=/usr/qt/3 -export QTDIR=${S} - -pkg_setup() { - if use immqt ; then - ewarn - ewarn "You are going to compile binary imcompatible immodule for Qt. This means" - ewarn "you have to recompile everything depending on Qt after you install it." - ewarn "Be aware." - ewarn - fi - - if useq ppc-macos ; then - export PLATFORM=darwin-g++ - export DYLD_LIBRARY_PATH="${QTDIR}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" - export INSTALL_ROOT="" - else - export PLATFORM=linux-g++ - fi -} - -src_unpack() { - unpack ${A} - - export QTDIR=${S} - cd ${S} - - cp configure configure.orig - sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure - - epatch ${FILESDIR}/qt-no-rpath-uic.patch - - # fix fullscreen mode for 64 bit archs (kde bug 92992) - # epatch ${FILESDIR}/${P}-amd64-fullscreen.patch - - # fix freeze caused by bad interaction with kde klipper (kde bug 80072) - epatch ${FILESDIR}/${P}-qclipboard-hack.patch - - # performance patches (see http://robotics.dei.unipd.it/~koral/KDE/kflicker.html) - epatch ${FILESDIR}/${P}-flickerfree_qiconview_buffered.patch - epatch ${FILESDIR}/${P}-flickerfree_qscrollview_fixwindowactivate.patch - - if use immqt || use immqt-bc ; then - epatch ../${IMMQT_P}.diff - sh make-symlinks.sh || die "make symlinks failed" - fi - - if use ppc-macos ; then - gzcat ${FILESDIR}/${P}-darwin-fink.patch.gz | sed -e "s:@QTBASE@:${QTBASE}:g" > ${T}/${P}-darwin-fink.patch - epatch ${T}/${P}-darwin-fink.patch - fi - - cd mkspecs/${PLATFORM} - # set c/xxflags and ldflags - strip-flags - sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \ - -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \ - -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \ - qmake.conf || die - cd ${S} -} - -src_compile() { - export QTDIR=${S} - export SYSCONF=${D}${QTBASE}/etc/settings - - # Let's just allow writing to these directories during Qt emerge - # as it makes Qt much happier. - addwrite "${QTBASE}/etc/settings" - addwrite "$HOME/.qt" - - use nas && myconf="${myconf} -system-nas-sound" - use gif && myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif" - use mysql && myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql" || myconf="${myconf} -no-sql-mysql" - use postgres && myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql" - use firebird && myconf="${myconf} -plugin-sql-ibase" || myconf="${myconf} -no-sql-ibase" - use sqlite && myconf="${myconf} -plugin-sql-sqlite" || myconf="${myconf} -no-sql-sqlite" - use odbc && myconf="${myconf} -plugin-sql-odbc" || myconf="${myconf} -no-sql-odbc" - use cups && myconf="${myconf} -cups" || myconf="${myconf} -no-cups" - use opengl && myconf="${myconf} -enable-module=opengl" || myconf="${myconf} -disable-opengl" - use debug && myconf="${myconf} -debug" || myconf="${myconf} -release -no-g++-exceptions" - use xinerama && myconf="${myconf} -xinerama" || myconf="${myconf} -no-xinerama" - use zlib && myconf="${myconf} -system-zlib" || myconf="${myconf} -qt-zlib" - use ipv6 && myconf="${myconf} -ipv6" || myconf="${myconf} -no-ipv6" - use immqt-bc && myconf="${myconf} -inputmethod" - use immqt && myconf="${myconf} -inputmethod -inputmethod-ext" - - if use ppc-macos ; then - myconf="${myconf} -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-cups -lresolv -shared" - myconf="${myconf} -I/usr/X11R6/include -L/usr/X11R6/lib" - myconf="${myconf} -L${S}/lib -I${S}/include" - sed -i -e "s,#define QT_AOUT_UNDERSCORE,," mkspecs/${PLATFORM}/qplatformdefs.h || die - fi - - export YACC='byacc -d' - - ./configure -sm -thread -stl -system-libjpeg -verbose -largefile \ - -qt-imgfmt-{jpeg,mng,png} -tablet -system-libmng \ - -system-libpng -lpthread -xft -platform ${PLATFORM} -xplatform \ - ${PLATFORM} -xrender -prefix ${QTBASE} -libdir ${QTBASE}/$(get_libdir) \ - -fast ${myconf} -dlopen-opengl || die - - export QTDIR=${S} - - emake src-qmake src-moc sub-src || die - DYLD_LIBRARY_PATH="${S}/lib:/usr/X11R6/lib:${DYLD_LIBRARY_PATH}" \ - LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" emake sub-tools || die -} - -src_install() { - export QTDIR=${S} - - # binaries - into $QTBASE - dobin bin/* - - # libraries - if use ppc-macos; then - # dolib is broken on BSD because of missing readlink(1) - dodir ${QTBASE}/$(get_libdir) - cp -fR lib/*.{dylib,la,a} ${D}/${QTBASE}/$(get_libdir) || die - - cd ${D}/${QTBASE}/$(get_libdir) - for lib in libqt-mt* ; do - ln -s ${lib} ${lib/-mt/} - done - else - dolib lib/lib{editor,qassistantclient,designercore}.a - dolib lib/libqt-mt.la - dolib lib/libqt-mt.so.3.3.4 lib/libqui.so.1.0.0 - cd ${D}/${QTBASE}/$(get_libdir) - - for x in libqui.so ; do - ln -s $x.1.0.0 $x.1.0 - ln -s $x.1.0 $x.1 - ln -s $x.1 $x - done - - # version symlinks - 3.3.3->3.3->3->.so - ln -s libqt-mt.so.3.3.4 libqt-mt.so.3.3 - ln -s libqt-mt.so.3.3 libqt-mt.so.3 - ln -s libqt-mt.so.3 libqt-mt.so - - # libqt -> libqt-mt symlinks - ln -s libqt-mt.so.3.3.4 libqt.so.3.3.4 - ln -s libqt-mt.so.3.3 libqt.so.3.3 - ln -s libqt-mt.so.3 libqt.so.3 - ln -s libqt-mt.so libqt.so - fi - - # plugins - cd ${S} - plugins=`find plugins -name "lib*.so" -print` - for x in $plugins; do - exeinto ${QTBASE}/`dirname $x` - doexe $x - done - - # Past this point just needs to be done once - is_final_abi || return 0 - - # includes - cd ${S} - dodir ${QTBASE}/include/private - cp include/* ${D}/${QTBASE}/include/ - cp include/private/* ${D}/${QTBASE}/include/private/ - - # misc - insinto /etc/env.d - doins ${FILESDIR}/{45qt3,50qtdir3} - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${QTBASE}/${libdir}" - done - dosed "s~^LDPATH=.*$~LDPATH=${libdirs:1}~" /etc/env.d/45qt3 - - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${QTBASE}/lib - fi - - dodir ${QTBASE}/tools/designer/templates - cd ${S} - cp tools/designer/templates/* ${D}/${QTBASE}/tools/designer/templates - - dodir ${QTBASE}/translations - cd ${S} - cp translations/* ${D}/${QTBASE}/translations - - dodir ${QTBASE}/etc - keepdir ${QTBASE}/etc/settings - - dodir ${QTBASE}/doc - - if use doc; then - cp -r ${S}/doc ${D}/${QTBASE} - - cd ${S}/examples - find . -name Makefile | while read MAKEFILE - do - cp ${MAKEFILE} ${MAKEFILE}.old - sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE} - rm -f ${MAKEFILE}.old - done - - cp -r ${S}/examples ${D}/${QTBASE} - - cd ${S}/tutorial - find . -name Makefile | while read MAKEFILE - do - cp ${MAKEFILE} ${MAKEFILE}.old - sed -e 's:${S}:${QTBASE}:g' ${MAKEFILE}.old > ${MAKEFILE} - rm -f ${MAKEFILE}.old - done - - cp -r ${S}/tutorial ${D}/${QTBASE} - fi - - if use immqt || use immqt-bc ; then - dodoc ${S}/README.immodule - fi - - # misc build reqs - dodir ${QTBASE}/mkspecs - cp -R ${S}/mkspecs/${PLATFORM} ${D}/${QTBASE}/mkspecs/ - - sed -e "s:${S}:${QTBASE}:g" \ - ${S}/.qmake.cache > ${D}${QTBASE}/.qmake.cache - - if use ppc-macos ; then - dosed "s:linux-g++:${PLATFORM}:" /etc/env.d/45qt3 \ - "s:\$(QTBASE):\$(QTDIR):g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf \ - "s:${S}:${QTBASE}:g" ${QTBASE}/mkspecs/${PLATFORM}/qmake.conf ${QTBASE}/lib/libqt-mt.la || die - fi -} |