Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (81882c79ffb435b3a55465e69e92cb060bb6385b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (81882c79ffb435b3a55465e69e92cb060bb6385b)
  • Date: Sat, 8 Sep 2007 10:36:12 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

x11-toolkits/qt-x11/175791_3.diff | 11 +++++++++++
x11-toolkits/qt-x11/DETAILS | 2 +-
x11-toolkits/qt-x11/HISTORY | 6 ++++++
x11-toolkits/qt-x11/PRE_BUILD | 1 +
x11-toolkits/qt4/175791_4.diff | 11 +++++++++++
x11-toolkits/qt4/DETAILS | 4 ++--
x11-toolkits/qt4/HISTORY | 6 ++++++
x11-toolkits/qt4/PRE_BUILD | 5 +++++
8 files changed, 43 insertions(+), 3 deletions(-)

New commits:
commit 4ea2c93340010fb29034c50e4d67c59171b11ba3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fix bug #13987

commit 48d99201d9dcbc6117e76e0ce959066cf4bd177d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fix bug #13987

commit b972fcb400dcac640c7b9c4070aad2ac22b8e8eb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ix bug #13987

diff --git a/x11-toolkits/qt-x11/175791_3.diff
b/x11-toolkits/qt-x11/175791_3.diff
new file mode 100644
index 0000000..06ae9e5
--- /dev/null
+++ b/x11-toolkits/qt-x11/175791_3.diff
@@ -0,0 +1,11 @@
+--- src/codecs/qutfcodec.cpp
++++ src/codecs/qutfcodec.cpp
+@@ -165,7 +165,7 @@ public:
+ QString toUnicode(const char* chars, int len)
+ {
+ QString result;
+- result.setLength( len ); // worst case
++ result.setLength( len + 1 ); // worst case
+ QChar *qch = (QChar *)result.unicode();
+ uchar ch;
+ int error = -1;
diff --git a/x11-toolkits/qt-x11/DETAILS b/x11-toolkits/qt-x11/DETAILS
index 565e387..4ae31ae 100755
--- a/x11-toolkits/qt-x11/DETAILS
+++ b/x11-toolkits/qt-x11/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-free-$VERSION
WEB_SITE=http://www.trolltech.com/qt/x11.html
KEYWORDS="qt x11 libs"
ENTERED=20020410
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
DOCS="FAQ README README-QT.TXT"
SHORT="Qt simplifies writing and maintaining GUI applications"
cat << EOF
diff --git a/x11-toolkits/qt-x11/HISTORY b/x11-toolkits/qt-x11/HISTORY
index 6c05737..3647de2 100644
--- a/x11-toolkits/qt-x11/HISTORY
+++ b/x11-toolkits/qt-x11/HISTORY
@@ -1,3 +1,9 @@
+2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patch
+ * 175791_3.diff: added
+ fixes bug #13987
+
2007-08-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD:apply patch
diff --git a/x11-toolkits/qt-x11/PRE_BUILD b/x11-toolkits/qt-x11/PRE_BUILD
index 6ccb4a4..efd567d 100755
--- a/x11-toolkits/qt-x11/PRE_BUILD
+++ b/x11-toolkits/qt-x11/PRE_BUILD
@@ -3,6 +3,7 @@ cd $SOURCE_DIRECTORY &&
# apply patches
patch -p0 < $SPELL_DIRECTORY/Qt-3.3.8-UTF-8-fix.diff &&
patch -p4 < $SPELL_DIRECTORY/170529.diff &&
+patch -p0 < $SPELL_DIRECTORY/175791_3.diff &&
# fix detecction of firebird
sedit "s/-lgds//" configure &&
sedit "/gds/D;/\t}/D" plugins/src/sqldrivers/ibase/ibase.pro &&
diff --git a/x11-toolkits/qt4/175791_4.diff b/x11-toolkits/qt4/175791_4.diff
new file mode 100644
index 0000000..645daa6
--- /dev/null
+++ b/x11-toolkits/qt4/175791_4.diff
@@ -0,0 +1,11 @@
+--- src/corelib/codecs/qutfcodec.cpp
++++ src/corelib/codecs/qutfcodec.cpp
+@@ -140,7 +140,7 @@ void QUtf8Codec::convertToUnicode(QString *target, const
char *chars, int len, C
+
+ int originalLength = target->length();
+ QString &result = *target;
+- result.resize(originalLength + len); // worst case
++ result.resize(originalLength + len + 1); // worst case
+ QChar *qch = result.data() + originalLength;
+ uchar ch;
+ int invalid = 0;
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 86ebcbf..120ed42 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -12,14 +12,14 @@ case $QT_VER in

SOURCE_HASH=sha512:2f2abaf38cd006ed6e83e06820ac4ff7d434e71459332b6bbef95564a60709b422f731b5aa86eca38b44e21e300b68b6957441d6515cf9a2e0935aee32ac97ac
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
;;
*) #stable
VERSION=4.3.1

SOURCE_HASH=sha512:2f2abaf38cd006ed6e83e06820ac4ff7d434e71459332b6bbef95564a60709b422f731b5aa86eca38b44e21e300b68b6957441d6515cf9a2e0935aee32ac97ac
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
esac
SOURCE_URL[0]=ftp://ftp.trolltech.com/$URI
SOURCE_URL[1]=ftp://ftp.silug.org/pub/$URI
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 2dddd09..4344d91 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patch
+ * 175791_4.diff: added
+ fix bug #13987
+
2007-08-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: update snapshot to 4.3.2

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

+# apply patches
+if [[ $QT_VER != snapshot ]]; then
+ patch -p0 < $SPELL_DIRECTORY/175791_4.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 \



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (81882c79ffb435b3a55465e69e92cb060bb6385b), Treeve Jelbert, 09/08/2007

Archive powered by MHonArc 2.6.24.

Top of Page