sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by George Sherwood (3d9508cf48c1405c32d317ba6e6d44f7846b2cdb)

From: George Sherwood <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (3d9508cf48c1405c32d317ba6e6d44f7846b2cdb)
Date: Fri, 1 Jun 2007 03:31:18 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

x11-toolkits/qt4/DETAILS | 4
x11-toolkits/qt4/HISTORY | 5 +
x11-toolkits/qt4/PRE_BUILD | 5 -
x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff | 133
-------------------------------
4 files changed, 7 insertions(+), 140 deletions(-)

New commits:
commit 3d9508cf48c1405c32d317ba6e6d44f7846b2cdb
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

qt4: Updated to version 4.3.0. Removed unneeded patch.

diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index bf859a0..54a9622 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -15,8 +15,8 @@ case $QT_VER in
SECURITY_PATCH=1
;;
*) #stable
- VERSION=4.2.3
-
SOURCE_HASH=sha512:e04568ac6c42d0d6d131ccbad89768248c5095b05e68cc1362fd1a3580197e37c416802c8fbf5411e6870e5bdd9e92ff133bcb2b4e42fd5cdf848404d50c733c
+ VERSION=4.3.0
+
SOURCE_HASH=sha512:0c2f08a95b164d5f01ed19a915333f90eef50d9a7958392d63b33b7de9c8f32d8fec19c53952d3848f4ee989717314172ab5aeb9f9c02a681ae5e4ccb1e4bc07
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=1
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index dd792f6..dc5a9ed 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,8 @@
+2007-06-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Update stable to 4.3.0.
+ * PRE_BUILD: Remove patch for stable.
+ * Qt-4.2.3-UTF-8-fix.diff: Removed. Incorporated Upstream.
+
2007-05-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: update snapshot to 4.3.0-snapshot-20070517

diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 966cdbd..6ee57a9 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,11 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-# apply patches
-if [ $QT_VER = stable ];then
-patch -p0 < $SPELL_DIRECTORY/Qt-4.2.3-UTF-8-fix.diff
-fi &&
-
# add better optimisation flags
# -O2 gives segmentation fault in moc when building tools
sed -i "s|-O2|${CFLAGS/-O3/-O2}|" mkspecs/common/g++.conf \
diff --git a/x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff
b/x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff
deleted file mode 100644
index 098f4d6..0000000
--- a/x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff
+++ /dev/null
@@ -1,133 +0,0 @@
---- src/corelib/codecs/qutfcodec.cpp Fri Mar 30 06:06:30 2007
-+++ src/corelib/codecs/qutfcodec.cpp Fri Mar 30 06:06:30 2007
-@@ -117,15 +117,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) {
-@@ -142,7 +146,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);
-@@ -153,14 +157,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;
-@@ -171,12 +188,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;
- }
- }
- }
-@@ -187,6 +214,7 @@
- if (headerdone)
- state->flags |= IgnoreHeader;
- state->state_data[0] = need ? uc : 0;
-+ state->state_data[1] = need ? min_uc : 0;
- }
- return result;
- }
-
---- src/corelib/tools/qstring.cpp Fri Mar 30 06:06:30 2007
-+++ src/corelib/tools/qstring.cpp Fri Mar 30 06:06:30 2007
-@@ -3342,6 +3342,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;
-@@ -3359,6 +3360,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;
- }
-@@ -3381,14 +3388,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);

[SM-Commit] GIT changes to master grimoire by George Sherwood (3d9508cf48c1405c32d317ba6e6d44f7846b2cdb), George Sherwood, 06/01/2007