removed old calvin folder

10 files changed, 0 insertions, 449 deletions

diff --git a/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff b/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff
deleted file mode 100644
index 7c25eef7d..000000000
--- a/arch/calvin/trinity-qt3/old-patches/eastern_asian_languagues.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-01-15 21:09:13.000000000 +0200
-+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-03-10 11:34:22.000000000 +0200
-@@ -966,20 +966,22 @@
- 
- #ifdef Q_WS_X11
-     if (script == QFont::Han) {
--	// modify script according to locale
--	static QFont::Script defaultHan = QFont::UnknownScript;
--	if (defaultHan == QFont::UnknownScript) {
--	    QCString locale = setlocale(LC_ALL, NULL);
--	    if (locale.contains("ko"))
--		defaultHan = QFont::Han_Korean;
--	    else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
--		defaultHan = QFont::Han_TraditionalChinese;
--	    else if (locale.contains("zh"))
--		defaultHan = QFont::Han_SimplifiedChinese;
--	    else
--		defaultHan = QFont::Han_Japanese;
--	}
--	script = defaultHan;
-+        // modify script according to locale
-+        static QFont::Script defaultHan;
-+        QCString locale = setlocale(LC_ALL, NULL);
-+
-+        if (locale.contains("ko"))
-+            defaultHan = QFont::Han_Korean;
-+        else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
-+            defaultHan = QFont::Han_TraditionalChinese;
-+        else if (locale.contains("zh"))
-+            defaultHan = QFont::Han_SimplifiedChinese;
-+        else if (locale.contains("ja"))
-+            defaultHan = QFont::Han_Japanese;
-+        else
-+            defaultHan = QFont::Han; // don't change
-+
-+        script = defaultHan;
-     }
- #endif
- 
diff --git a/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff b/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff
deleted file mode 100644
index caa9bfc44..000000000
--- a/arch/calvin/trinity-qt3/old-patches/gcc46-arch.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qmap.h
---- qt-x11-free-3.3.8b
-+++ qt-x11-free-3.3.8b/src/tools/qmap.h	2011-05-10 08:47:27.000000000 -0500
-@@ -50,6 +50,7 @@
- #endif // QT_H
- 
- #ifndef QT_NO_STL
-+#include <cstddef>
- #include <iterator>
- #include <map>
- #endif
-@@ -107,7 +108,7 @@
- #endif
-     typedef T          value_type;
- #ifndef QT_NO_STL
--    typedef ptrdiff_t  difference_type;
-+    typedef std::ptrdiff_t  difference_type;
- #else
-     typedef int difference_type;
- #endif
-@@ -223,7 +224,7 @@
- #endif
-     typedef T          value_type;
- #ifndef QT_NO_STL
--    typedef ptrdiff_t  difference_type;
-+    typedef std::ptrdiff_t  difference_type;
- #else
-     typedef int difference_type;
- #endif
-@@ -604,7 +605,7 @@
-     typedef value_type& reference;
-     typedef const value_type& const_reference;
- #ifndef QT_NO_STL
--    typedef ptrdiff_t  difference_type;
-+    typedef std::ptrdiff_t  difference_type;
- #else
-     typedef int difference_type;
- #endif
-diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluelist.h
---- qt-x11-free-3.3.8b
-+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h	2011-05-10 08:46:46.000000000 -0500
-@@ -50,6 +50,7 @@
- #ifndef QT_NO_STL
- #include <iterator>
- #include <list>
-+#include <cstddef>
- #endif
- 
- //#define QT_CHECK_VALUELIST_RANGE
-diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluevector.h
---- qt-x11-free-3.3.8b
-+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h	2011-05-10 08:46:46.000000000 -0500
-@@ -244,7 +244,7 @@
-     typedef const value_type& const_reference;
-     typedef size_t size_type;
- #ifndef QT_NO_STL
--    typedef ptrdiff_t difference_type;
-+    typedef std::ptrdiff_t difference_type;
- #else
-     typedef int difference_type;
- #endif
diff --git a/arch/calvin/trinity-qt3/old-patches/mysql.patch b/arch/calvin/trinity-qt3/old-patches/mysql.patch
deleted file mode 100644
index 5f61edc67..000000000
--- a/arch/calvin/trinity-qt3/old-patches/mysql.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/sql/drivers/mysql/qsql_mysql.cpp
-+++ src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -37,7 +37,6 @@
- #include "qsql_mysql.h"
- #include <private/qsqlextension_p.h>
- 
--#include <qapplication.h>
- #include <qdatetime.h>
- #include <qvaluevector.h>
- #include <qsqlrecord.h>
-@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
- }
- 
- /////////////////////////////////////////////////////////
--static void qServerEnd()
--{
--#ifndef Q_NO_MYSQL_EMBEDDED
--# if MYSQL_VERSION_ID >= 40000
--    mysql_server_end();
--# endif // MYSQL_VERSION_ID
--#endif // Q_NO_MYSQL_EMBEDDED
--}
- 
- static void qServerInit()
- {
-@@ -366,9 +357,7 @@ static void qServerInit()
- 	qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
- #  endif
-     }
--    qAddPostRoutine(qServerEnd);
-     init = TRUE;    
--    
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
- }
-@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
- 	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
- 	delete ext;
-     }
-+#ifndef Q_NO_MYSQL_EMBEDDED
-+# if MYSQL_VERSION_ID > 40000
-+    mysql_server_end();
-+# endif
-+#endif
- }
- 
- bool QMYSQLDriver::hasFeature( DriverFeature f ) const
diff --git a/arch/calvin/trinity-qt3/old-patches/qt-copy-kde-patches.tar.bz2 b/arch/calvin/trinity-qt3/old-patches/qt-copy-kde-patches.tar.bz2
deleted file mode 100644
index 19d899963..000000000
--- a/arch/calvin/trinity-qt3/old-patches/qt-copy-kde-patches.tar.bz2
+++ /dev/null
diff --git a/arch/calvin/trinity-qt3/old-patches/qt-font-default-subst.diff b/arch/calvin/trinity-qt3/old-patches/qt-font-default-subst.diff
deleted file mode 100644
index 3e286f74e..000000000
--- a/arch/calvin/trinity-qt3/old-patches/qt-font-default-subst.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/kernel/qfontdatabase_x11.cpp
-+++ src/kernel/qfontdatabase_x11.cpp
-@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s
- 	    if (script == QFont::Latin)
- 		// add Euro character
- 		FcCharSetAddChar(cs, 0x20ac);
--	    if (script == QFont::Han_SimplifiedChinese)
--		FcCharSetAddChar(cs, 0x3400);
--	    if (script == QFont::Han_TraditionalChinese){
--		FcCharSetAddChar(cs, 0x3435);
--		FcCharSetAddChar(cs, 0xE000);
--		FcCharSetAddChar(cs, 0xF6B1);
--	    }
--	    if (script == QFont::MiscellaneousSymbols)
--		FcCharSetAddChar(cs, 0x2714);
- 	    FcPatternAddCharSet(pattern, FC_CHARSET, cs);
- 	    FcCharSetDestroy(cs);
- 	}
-@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c
-     FcPatternPrint(pattern);
- #endif
- 
-+    // XftFontMatch calls the right ConfigSubstitute variants, but as we use
-+    // FcFontMatch/Sort here we have to do it manually.
-     FcConfigSubstitute(0, pattern, FcMatchPattern);
-+    XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
-+
- //     qDebug("1: pattern contains:");
- //     FcPatternPrint(pattern);
- 
-@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c
- 	    value.u.s = (const FcChar8 *)cs.data();
- 	    FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
- 	}
--#ifdef FONT_MATCH_DEBUG
--	printf("final pattern contains:\n");
--	FcPatternPrint(pattern);
--#endif
-     }
- 
-     if (script != QFont::Unicode) {
-@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c
-         if (script == QFont::Latin)
-             // add Euro character
-             FcCharSetAddChar(cs, 0x20ac);
--	if (script == QFont::Han_SimplifiedChinese)
--	    FcCharSetAddChar(cs, 0x3400);
--	if (script == QFont::Han_TraditionalChinese) {
--	    FcCharSetAddChar(cs, 0x3435);
--	    FcCharSetAddChar(cs, 0xE000);
--	    FcCharSetAddChar(cs, 0xF6B1);
--	}
--	if (script == QFont::MiscellaneousSymbols)
--	    FcCharSetAddChar(cs, 0x2714);
-         FcPatternAddCharSet(pattern, FC_CHARSET, cs);
-         FcCharSetDestroy(cs);
-     }
- 
-+#ifdef FONT_MATCH_DEBUG
-+	printf("final pattern contains:\n");
-+	FcPatternPrint(pattern);
-+#endif
-+
-     QFontEngine *fe = 0;
- 
-     for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) {
---- src/kernel/qfontdatabase.cpp
-+++ src/kernel/qfontdatabase.cpp
-@@ -554,7 +554,7 @@ static const unsigned short sample_chars
-     // GeometricSymbols,
-     { 0x2500, 0x0 },
-     // MiscellaneousSymbols,
--    { 0x2640, 0x0 },
-+    { 0x2640, 0x2714, 0x0 },
-     // EnclosedAndSquare,
-     { 0x2460, 0x0 },
-     // Braille,
diff --git a/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch b/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch
deleted file mode 100644
index 6f21e3cf1..000000000
--- a/arch/calvin/trinity-qt3/old-patches/qt-odbc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-02-24 11:32:27.000000000 +0100
-+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp	2009-02-24 11:33:43.000000000 +0100
-@@ -57,13 +57,13 @@
- #endif
- 
- // newer platform SDKs use SQLLEN instead of SQLINTEGER
--#ifdef SQLLEN
-+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLLEN SQLLEN
- #else
- # define QSQLLEN SQLINTEGER
- #endif
- 
--#ifdef SQLULEN
-+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLULEN SQLULEN
- #else
- # define QSQLULEN SQLUINTEGER
diff --git a/arch/calvin/trinity-qt3/old-patches/qt-patches.tar.bz2 b/arch/calvin/trinity-qt3/old-patches/qt-patches.tar.bz2
deleted file mode 100644
index 3f4aee171..000000000
--- a/arch/calvin/trinity-qt3/old-patches/qt-patches.tar.bz2
+++ /dev/null
diff --git a/arch/calvin/trinity-qt3/old-patches/qt3-png14.patch b/arch/calvin/trinity-qt3/old-patches/qt3-png14.patch
deleted file mode 100644
index e8a194529..000000000
--- a/arch/calvin/trinity-qt3/old-patches/qt3-png14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/kernel/qpngio.cpp.orig	2010-01-16 22:02:41.000000000 +0100
-+++ src/kernel/qpngio.cpp	2010-01-16 22:03:56.000000000 +0100
-@@ -159,7 +159,7 @@
- 		image.setColor( i, qRgba(c,c,c,0xff) );
- 	    }
- 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
--		const int g = info_ptr->trans_values.gray;
-+		const int g = info_ptr->trans_color.gray;
- 		if (g < ncols) {
- 		    image.setAlphaBuffer(TRUE);
- 		    image.setColor(g, image.color(g) & RGB_MASK);
-@@ -187,7 +187,7 @@
- 		    info_ptr->palette[i].red,
- 		    info_ptr->palette[i].green,
- 		    info_ptr->palette[i].blue,
--		    info_ptr->trans[i]
-+		    info_ptr->trans_alpha[i]
- 		    )
- 		);
- 		i++;
-@@ -321,9 +321,9 @@
- png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
-     if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
- 	QRgb trans = 0xFF000000 | qRgb(
--	      (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
--	      (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
--	      (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
-+	      (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
-+	      (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
-+	      (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
- 	for (uint y=0; y<height; y++) {
- 	    for (uint x=0; x<info_ptr->width; x++) {
- 		if (((uint**)jt)[y][x] == trans) {
diff --git a/arch/calvin/trinity-qt3/old-patches/qt3_3.3.8c.arch.diff b/arch/calvin/trinity-qt3/old-patches/qt3_3.3.8c.arch.diff
deleted file mode 100644
index 39c751a71..000000000
--- a/arch/calvin/trinity-qt3/old-patches/qt3_3.3.8c.arch.diff
+++ /dev/null
@@ -1,72 +0,0 @@
---- include/qobject.h	2008-01-15 13:09:13.000000000 -0600
-+++ include/qobject.h	2011-01-01 18:33:19.715656496 -0600
-@@ -101,8 +101,11 @@
-
-     QObject           *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
-     const QObjectList *children() const { return childObjects; }
-+    QObjectList childrenListObject();
-+    const QObjectList childrenListObject() const;
-
-     static const QObjectList *objectTrees();
-+    static const QObjectList objectTreesListObject();
-
-     QObjectList	      *queryList( const char *inheritsClass = 0,
- 				  const char *objName = 0,
---- src/kernel/qobject.cpp	2008-01-15 13:09:13.000000000 -0600
-+++ src/kernel/qobject.cpp	2011-01-01 18:28:16.191270264 -0600
-@@ -360,6 +360,30 @@
-     }
- }
-
-+/*! \internal
-+    TQt compatibility function
-+*/
-+QObjectList QObject::childrenListObject() {
-+	if (children()) return *(children());
-+	else return QObjectList();
-+}
-+
-+/*! \internal
-+    TQt compatibility function
-+*/
-+const QObjectList QObject::childrenListObject() const {
-+	if (children()) return *(children());
-+	else return QObjectList();
-+}
-+
-+/*! \internal
-+    TQt compatibility function
-+*/
-+const QObjectList QObject::objectTreesListObject() {
-+	if (objectTrees()) return *(objectTrees());
-+	else return QObjectList();
-+}
-+
-
- /*****************************************************************************
-   QObject member functions
---- src/kernel/qobject.h	2008-01-15 13:09:13.000000000 -0600
-+++ src/kernel/qobject.h	2011-01-01 18:33:19.715656496 -0600
-@@ -101,8 +101,11 @@
-
-     QObject           *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
-     const QObjectList *children() const { return childObjects; }
-+    QObjectList childrenListObject();
-+    const QObjectList childrenListObject() const;
-
-     static const QObjectList *objectTrees();
-+    static const QObjectList objectTreesListObject();
-
-     QObjectList	      *queryList( const char *inheritsClass = 0,
- 				  const char *objName = 0,
---- src/tools/qglobal.h	2008-01-15 21:09:13.000000000 +0200
-+++ src/tools/qglobal.h	2011-03-15 00:28:11.221711757 +0200
-@@ -41,7 +41,7 @@
- #ifndef QGLOBAL_H
- #define QGLOBAL_H
-
--#define QT_VERSION_STR   "3.3.8b"
-+#define QT_VERSION_STR   "3.3.8c"
- /*
-    QT_VERSION is (major << 16) + (minor << 8) + patch.
-  */
diff --git a/arch/calvin/trinity-qt3/old-patches/utf8-bug-qt3.diff b/arch/calvin/trinity-qt3/old-patches/utf8-bug-qt3.diff
deleted file mode 100644
index 43e84a99f..000000000
--- a/arch/calvin/trinity-qt3/old-patches/utf8-bug-qt3.diff
+++ /dev/null
@@ -1,101 +0,0 @@
---- src/codecs/qutfcodec.cpp
-+++ src/codecs/qutfcodec.cpp
-@@ -154,6 +154,7 @@
- 
- class QUtf8Decoder : public QTextDecoder {
-     uint uc;
-+    uint min_uc;
-     int need;
-     bool headerDone;
- public:
-@@ -167,8 +168,9 @@
- 	result.setLength( len ); // worst case
- 	QChar *qch = (QChar *)result.unicode();
- 	uchar ch;
-+        int error = -1;
- 	for (int i=0; i<len; i++) {
--	    ch = *chars++;
-+	    ch = chars[i];
- 	    if (need) {
- 		if ( (ch&0xc0) == 0x80 ) {
- 		    uc = (uc << 6) | (ch & 0x3f);
-@@ -182,6 +184,8 @@
- 			    *qch++ = QChar(high);
- 			    *qch++ = QChar(low);
- 			    headerDone = TRUE;
-+			} else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+                            *qch++ = QChar::replacement;
- 			} else {
- 			    if (headerDone || QChar(uc) != QChar::byteOrderMark)
- 				*qch++ = uc;
-@@ -190,6 +194,7 @@
- 		    }
- 		} else {
- 		    // error
-+                    i = error;
- 		    *qch++ = QChar::replacement;
- 		    need = 0;
- 		}
-@@ -200,12 +205,21 @@
- 		} else if ((ch & 0xe0) == 0xc0) {
- 		    uc = ch & 0x1f;
- 		    need = 1;
-+                    error = i;
-+		    min_uc = 0x80;
- 		} else if ((ch & 0xf0) == 0xe0) {
- 		    uc = ch & 0x0f;
- 		    need = 2;
-+                    error = i;
-+		    min_uc = 0x800;
- 		} else if ((ch&0xf8) == 0xf0) {
- 		    uc = ch & 0x07;
- 		    need = 3;
-+                    error = i;
-+                    min_uc = 0x10000;
-+                } else {
-+                    // error
-+                    *qch++ = QChar::replacement;
- 		}
- 	    }
- 	}
---- src/tools/qstring.cpp
-+++ src/tools/qstring.cpp
-@@ -5805,6 +5805,7 @@
-     result.setLength( len ); // worst case
-     QChar *qch = (QChar *)result.unicode();
-     uint uc = 0;
-+    uint min_uc = 0;
-     int need = 0;
-     int error = -1;
-     uchar ch;
-@@ -5822,6 +5823,12 @@
- 			unsigned short low = uc%0x400 + 0xdc00;
- 			*qch++ = QChar(high);
- 			*qch++ = QChar(low);
-+		    } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+			// overlong seqence, UTF16 surrogate or BOM
-+                        i = error;
-+                        qch = addOne(qch, result);
-+                        *qch++ = QChar(0xdbff);
-+                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
- 		    } else {
- 			*qch++ = uc;
- 		    }
-@@ -5844,14 +5851,17 @@
- 		uc = ch & 0x1f;
- 		need = 1;
- 		error = i;
-+		min_uc = 0x80;
- 	    } else if ((ch & 0xf0) == 0xe0) {
- 		uc = ch & 0x0f;
- 		need = 2;
- 		error = i;
-+		min_uc = 0x800;
- 	    } else if ((ch&0xf8) == 0xf0) {
- 		uc = ch & 0x07;
- 		need = 3;
- 		error = i;
-+		min_uc = 0x10000;
- 	    } else {
- 	        // Error
-                 qch = addOne(qch, result);