[Frugalware-darcs] frugalware-current: qt4-4.3.0-1-i686

crazy crazy at frugalware.org
Sat Jun 2 20:34:22 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070602182957-f6986-1cfc810af37bdb319f0fb2a40f1a9ab4cde8dd32.gz;

[qt4-4.3.0-1-i686
crazy <crazy at frugalware.org>**20070602182957
 * Version bump
 * bye glib2 depend 
 * build() fixes 
 * compiled for now with -Os because this gcc bug ( see comment about in FB )
 * this is an debug build but stripped 
] {
hunk ./source/kde-extra/qt4/FrugalBuild 6
-pkgver=4.2.3
-pkgrel=2
+pkgver=4.3.0
+pkgrel=1
hunk ./source/kde-extra/qt4/FrugalBuild 11
-depends=('libxrandr' 'mesa' 'libxft' 'libmng' 'libjpeg' 'libxcursor' 'libxinerama' 'freetype2' \
-	'libsm' 'libpng' 'libxtst' 'fontconfig' 'dbus>=0.93' 'glib2')
-## glib2 only for some tests for now will be removed for kde4.
+depends=('libxrandr' 'mesa>=6.5.3' 'libxft' 'libmng' 'libjpeg' 'libxcursor' 'libxinerama' 'freetype2' \
+	'libsm' 'libpng' 'libxtst' 'fontconfig' 'dbus>=0.93')
hunk ./source/kde-extra/qt4/FrugalBuild 21
-	qt4config.desktop dummy.patch qt4.sh.off Trolltech.conf \
-	Qt-$pkgver-UTF-8-fix.patch)
-	#http://ftp.frugalware.org/pub/other/sources/kde/$pkgname/remove-crap2.patch)
+	qt4config.desktop dummy.patch qt4.sh.off Trolltech.conf)
hunk ./source/kde-extra/qt4/FrugalBuild 36
-	unset MAKEFLAGS
+	#unset MAKEFLAGS
hunk ./source/kde-extra/qt4/FrugalBuild 39
+	## !WARNING DO NOT CHANGE THIS *FLAGS TILL WE FIX THIS GCC BUG!
+	## -O1,-O2,-O3 is still broken do not use or it will eat your box 
+	## -Os does not eat that much ( ohh well ) RAM but is *slow* as *hell*
+	export CFLAGS="$(echo $CFLAGS|sed 's/-O2/-Os/')"
+	export CXXFLAGS="$(echo $CXXFLAGS|sed 's/-O2/-Os/')"
hunk ./source/kde-extra/qt4/FrugalBuild 54
-		-release -shared -nis -qt-gif -stl -pch -sm \
+		-debug -shared -nis -qt-gif -stl -pch -sm \
hunk ./source/kde-extra/qt4/FrugalBuild 60
-		-plugin-sql-sqlite -plugin-sql-sqlite2 -plugin-sql-odbc -qdbus -glib -no-separate-debug-info \
-		 || return 1
-	Fsed "-L$startdir/src/$origname-$pkgmore-$pkgver/lib" "" lib/*
-	## for some reason without the extra -I/*'s we have some weird compile errors
-	## some missing folder :)
+		-plugin-sql-sqlite -plugin-sql-sqlite2 -plugin-sql-odbc -qdbus -no-glib -no-separate-debug-info \
+		-optimized-qmake -fast || return 1
hunk ./source/kde-extra/qt4/FrugalBuild 71
-	## fix *.pc file location
-	Fmv /usr/lib/*.pc usr/lib/pkgconfig/
hunk ./source/kde-extra/qt4/FrugalBuild 91
-sha1sums=('b988aab4fa1dcce8532c36bb63947a556076e8c8'\
+sha1sums=('e433cf5482f24e81fa0b83bd1ed9a9c0abeb6ea4'\
hunk ./source/kde-extra/qt4/FrugalBuild 98
-          '2468fea7b127253832148115d5aa9e85b2e0aea6'\
-          '8f9843991d4773f10986069ee996eb1668196a49')
+          '2468fea7b127253832148115d5aa9e85b2e0aea6')
hunk ./source/kde-extra/qt4/Qt-4.2.3-UTF-8-fix.patch 1
-diff -Naur qt-x11-opensource-src-4.2.3/src/corelib/codecs/qutfcodec.cpp qt-x11-opensource-src-4.2.3-p/src/corelib/codecs/qutfcodec.cpp
---- qt-x11-opensource-src-4.2.3/src/corelib/codecs/qutfcodec.cpp	2007-02-21 10:58:41.000000000 +0100
-+++ qt-x11-opensource-src-4.2.3-p/src/corelib/codecs/qutfcodec.cpp	2007-04-05 11:53:31.000000000 +0200
-@@ -127,15 +127,19 @@
-     bool headerdone = false;
-     QChar replacement = QChar::ReplacementCharacter;
-     int need = 0;
-+    int error = -1;
-     uint uc = 0;
-+    uint min_uc = 0;
-     if (state) {
-         if (state->flags & IgnoreHeader)
-             headerdone = true;
-         if (state->flags & ConvertInvalidToNull)
-             replacement = QChar::Null;
-         need = state->remainingChars;
--        if (need)
-+        if (need) {
-             uc = state->state_data[0];
-+            min_uc = state->state_data[1];
-+        }
-     }
-     if (!headerdone && len > 3
-         && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb && (uchar)chars[2] == 0xbf) {
-@@ -152,7 +156,7 @@
-     int invalid = 0;
- 
-     for (int i=0; i<len; i++) {
--        ch = *chars++;
-+        ch = chars[i];
-         if (need) {
-             if ((ch&0xc0) == 0x80) {
-                 uc = (uc << 6) | (ch & 0x3f);
-@@ -163,14 +167,27 @@
-                         uc -= 0x10000;
-                         unsigned short high = uc/0x400 + 0xd800;
-                         unsigned short low = uc%0x400 + 0xdc00;
-+
-+                        // resize if necessary
-+                        long where = qch - result.unicode();
-+                        if (where + 2 >= result.size()) {
-+                            result.resize(where + 2);
-+                            qch = result.data() + where;
-+                        }
-+
-                         *qch++ = QChar(high);
-                         *qch++ = QChar(low);
-+                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+                        // error
-+                        *qch++ = QChar::ReplacementCharacter;
-+                        ++invalid;
-                     } else {
-                         *qch++ = uc;
-                     }
-                 }
-             } else {
-                 // error
-+                i = error;
-                 *qch++ = QChar::ReplacementCharacter;
-                 ++invalid;
-                 need = 0;
-@@ -181,12 +198,22 @@
-             } 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::ReplacementCharacter;
-+                ++invalid;
-             }
-         }
-     }
-@@ -197,6 +224,7 @@
-         if (headerdone)
-             state->flags |= IgnoreHeader;
-         state->state_data[0] = need ? uc : 0;
-+        state->state_data[1] = need ? min_uc : 0;
-     }
-     return result;
- }
-diff -Naur qt-x11-opensource-src-4.2.3/src/corelib/tools/qstring.cpp qt-x11-opensource-src-4.2.3-p/src/corelib/tools/qstring.cpp
---- qt-x11-opensource-src-4.2.3/src/corelib/tools/qstring.cpp	2007-02-21 10:58:43.000000000 +0100
-+++ qt-x11-opensource-src-4.2.3-p/src/corelib/tools/qstring.cpp	2007-04-05 11:53:31.000000000 +0200
-@@ -3352,6 +3352,7 @@
-     result.resize(size); // worst case
-     ushort *qch = result.d->data;
-     uint uc = 0;
-+    uint min_uc = 0;
-     int need = 0;
-     int error = -1;
-     uchar ch;
-@@ -3369,6 +3370,12 @@
-                         ushort low = uc%0x400 + 0xdc00;
-                         *qch++ = high;
-                         *qch++ = 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++ = 0xdbff;
-+                        *qch++ = 0xde00 + ((uchar)str[i]);
-                     } else {
-                         *qch++ = uc;
-                     }
-@@ -3391,14 +3398,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);
rmfile ./source/kde-extra/qt4/Qt-4.2.3-UTF-8-fix.patch
}


More information about the Frugalware-darcs mailing list