Skip to Content.
Sympa Menu

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

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 (92ddc3c21dafb79ea1e5ebc56b437a3ed65effb1)
  • Date: Fri, 6 Feb 2009 04:15:07 -0600

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

x11-toolkits/qt4/DETAILS | 6 +++---
x11-toolkits/qt4/HISTORY | 6 ++++++
x11-toolkits/qt4/PRE_BUILD | 4 +++-
x11-toolkits/qt4/grind.diff | 29 +++++++++++++++++++++++++++++
4 files changed, 41 insertions(+), 4 deletions(-)

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

qt4-4.5.0-rc1

diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index d0aea97..de3e186 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,15 +2,15 @@
SPELLX=qt-x11-opensource-src
case $QT_VER in
snapshot)
- VERSION=4.4.4-snapshot-$(date +%Y%m%d)
+ VERSION=4.5.0-snapshot-$(date +%Y%m%d)
SOURCE_IGNORE=volatile
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/snapshots/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
;;
prerelease)
- VERSION=4.4.3
-
SOURCE_HASH=sha512:62143283df90aa5525ea72b687fceacae46ea4b75ab84d6d55ff0f0c81b8a8c76923782eadc2772f569998df8593daa7635a03b5bf32fc48ed50ec1acc5a49b6
+ VERSION=4.5.0-rc1
+
SOURCE_HASH=sha512:58e71638694ee72554c5e02ee2cb2a26a717ae5dbd45f7413a778b9774ec98aac7f947221d693250a71a95992c2ee70debbe2b30f1d20bf4c53cfd62ce8bb453
SOURCE=${SPELLX}-$VERSION.tar.bz2
URI=qt/source/$SOURCE
SECURITY_PATCH=2
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index ec387de..f48e9bd 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2009-02-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.5.0-rc1 (prerelease)
+ 4.5.0 ( snapshot )
+ * grind.diff: fix compile of prerelease
+ * PRE_BUILD: apply patch
+
2009-01-31 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Remove optional_depends stlport.
* BUILD: Remove forced -stl flag.
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 71fe71e..45eaeb5 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-
+if [[ $QT_VER == prerelease ]];then
+patch -p1 < $SPELL_DIRECTORY/grind.diff
+fi &&

# add better optimisation flags
# -O2 gives segmentation fault in moc when building tools
diff --git a/x11-toolkits/qt4/grind.diff b/x11-toolkits/qt4/grind.diff
new file mode 100644
index 0000000..dd258a3
--- /dev/null
+++ b/x11-toolkits/qt4/grind.diff
@@ -0,0 +1,29 @@
+diff -u qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp
qt-x11-opensource-src-4.5.0-snapshot-20090206/src/testlib/qtestcase.cpp
+--- qt-x11-opensource-src-4.5.0-rc1/src/testlib/qtestcase.cpp 2009-02-04
17:05:30.000000000 +0100
++++ qt-x11-opensource-src-4.5.0-snapshot-20090206/src/testlib/qtestcase.cpp
2009-02-06 01:44:53.000000000 +0100
+@@ -1359,6 +1359,9 @@
+ QBenchmarkGlobalData benchmarkData;
+ QBenchmarkGlobalData::current = &benchmarkData;
+
++#ifdef QTESTLIB_USE_VALGRIND
++ int callgrindChildExitCode = 0;
++#endif
+
+ #ifdef Q_WS_MAC
+ bool macNeedsActivate = qApp &&
qstrcmp(qApp->metaObject()->className(), "QApplicaion");
+@@ -1411,7 +1414,6 @@
+ QTestResult::setCurrentTestObject(metaObject->className());
+ qParseArgs(argc, argv);
+ #ifdef QTESTLIB_USE_VALGRIND
+- int callgrindChildExitCode;
+ if (QBenchmarkGlobalData::current->mode() ==
QBenchmarkGlobalData::CallgrindParentProcess) {
+ const QStringList origAppArgs(QCoreApplication::arguments());
+ if (!QBenchmarkValgrindUtils::rerunThroughCallgrind(origAppArgs,
callgrindChildExitCode))
+@@ -1436,6 +1438,7 @@
+ QTestResult::setCurrentTestFunction(0);
+ }
+
++ QTestLog::stopLogging();
+ #ifdef QT_MAC_USE_COCOA
+ if (macNeedsActivate) {
+ IOPMAssertionRelease(powerID);



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (92ddc3c21dafb79ea1e5ebc56b437a3ed65effb1), Treeve Jelbert, 02/06/2009

Archive powered by MHonArc 2.6.24.

Top of Page