Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (32284a00e7477536246882293c99646696867f01)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (32284a00e7477536246882293c99646696867f01)
  • Date: Sun, 14 Oct 2007 01:13:35 -0500

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

x11-toolkits/qt4/175791_4.diff | 11 -----------
x11-toolkits/qt4/DETAILS | 8 ++++----
x11-toolkits/qt4/HISTORY | 5 +++++
x11-toolkits/qt4/PRE_BUILD | 4 ----
4 files changed, 9 insertions(+), 19 deletions(-)

New commits:
commit 32284a00e7477536246882293c99646696867f01
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

qt4: Updated to version 4.3.2. Removed incoporated patch.

diff --git a/x11-toolkits/qt4/175791_4.diff b/x11-toolkits/qt4/175791_4.diff
deleted file mode 100644
index 645daa6..0000000
--- a/x11-toolkits/qt4/175791_4.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 120ed42..66b5ff3 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -8,15 +8,15 @@ case $QT_VER in
URI=qt/snapshots/$SOURCE
;;
prerelease)
- VERSION=4.3.1
-
SOURCE_HASH=sha512:2f2abaf38cd006ed6e83e06820ac4ff7d434e71459332b6bbef95564a60709b422f731b5aa86eca38b44e21e300b68b6957441d6515cf9a2e0935aee32ac97ac
+ VERSION=4.3.2
+
SOURCE_HASH=sha512:74658efebd69ef11cc75ac7d71cfca82ba6d5c1c61e09de51e5615afc170047d411213dab0d472d04ba1865b5c4a6cd46ab4df5ed55194bdd4e9bf3fea3e29e1
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=2
;;
*) #stable
- VERSION=4.3.1
-
SOURCE_HASH=sha512:2f2abaf38cd006ed6e83e06820ac4ff7d434e71459332b6bbef95564a60709b422f731b5aa86eca38b44e21e300b68b6957441d6515cf9a2e0935aee32ac97ac
+ VERSION=4.3.2
+
SOURCE_HASH=sha512:74658efebd69ef11cc75ac7d71cfca82ba6d5c1c61e09de51e5615afc170047d411213dab0d472d04ba1865b5c4a6cd46ab4df5ed55194bdd4e9bf3fea3e29e1
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=2
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 4344d91..b0310da 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,8 @@
+2007-10-13 George Sherwood <george AT beernabeer.com>
+ * DETAILS: Updated to version 4.3.2
+ * PRE_BUILD: Removed incorporated patch
+ * 175791_4.diff: Removed. Incoporated upstream.
+
2007-09-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD: apply patch
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index fcc3f38..71fe71e 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,10 +1,6 @@
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



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (32284a00e7477536246882293c99646696867f01), George Sherwood, 10/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page