Skip to Content.
Sympa Menu

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

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 (6fb0423ed0d4862611d45037392b978bfa1651b3)
  • Date: Tue, 3 Mar 2009 10:50:48 -0600

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

x11-toolkits/qt4/DETAILS | 35 ++++++++++++++++++-----------------
x11-toolkits/qt4/HISTORY | 9 +++++++++
x11-toolkits/qt4/PREPARE | 2 +-
x11-toolkits/qt4/PRE_BUILD | 3 ---
x11-toolkits/qt4/grind.diff | 29 -----------------------------
5 files changed, 28 insertions(+), 50 deletions(-)

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

qt4: => 4.5.0

diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index de3e186..5c75bfa 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -1,35 +1,36 @@
SPELL=qt4
SPELLX=qt-x11-opensource-src
case $QT_VER in
- snapshot)
- 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
- ;;
+# snapshot)
+# 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.5.0-rc1
-
SOURCE_HASH=sha512:58e71638694ee72554c5e02ee2cb2a26a717ae5dbd45f7413a778b9774ec98aac7f947221d693250a71a95992c2ee70debbe2b30f1d20bf4c53cfd62ce8bb453
- SOURCE=${SPELLX}-$VERSION.tar.bz2
+ VERSION=4.5.0
+
SOURCE_HASH=sha512:9c392b72164c42877b75cdef89f5aab53fcbb148d01953701d8f1e8c41e5d36054f251e390af686297c8b8ee2bbcd1936de2589dee2e290c9d56ed2a0fec59e6
+ SOURCE=${SPELLX}-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-$VERSION
;;
*) #stable
- VERSION=4.4.3
-
SOURCE_HASH=sha512:62143283df90aa5525ea72b687fceacae46ea4b75ab84d6d55ff0f0c81b8a8c76923782eadc2772f569998df8593daa7635a03b5bf32fc48ed50ec1acc5a49b6
+ VERSION=4.5.0
+
SOURCE_HASH=sha512:9c392b72164c42877b75cdef89f5aab53fcbb148d01953701d8f1e8c41e5d36054f251e390af686297c8b8ee2bbcd1936de2589dee2e290c9d56ed2a0fec59e6
SOURCE=$SPELLX-$VERSION.tar.bz2
URI=qt/source/$SOURCE
SECURITY_PATCH=2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
esac
- SOURCE_URL[0]=ftp://ftp.trolltech.com/$URI
- SOURCE_URL[1]=ftp://ftp.silug.org/pub/$URI
- SOURCE_URL[2]=ftp://ftp.planetmirror.com.au/pub/trolltech/$URI
- WEB_SITE=http://www.trolltech.com/qt/x11.html
+ SOURCE_URL[0]=http://download.qtsoftware.com/$URI
+# SOURCE_URL[1]=ftp://ftp.silug.org/pub/$URI
+# SOURCE_URL[2]=ftp://ftp.planetmirror.com.au/pub/trolltech/$URI
+#http://ftp.heanet.ie/mirrors/
+ WEB_SITE=http://www.qtsoftware.com//products
ENTERED=20020410
- LICENSE[0]=GPL
+ LICENSE[0]=LGPL
DOCS="FAQ README README-QT.TXT"
KEYWORDS="qt x11 libs"
SHORT="Qt simplifies writing and maintaining GUI applications"
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index f48e9bd..11854fc 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,12 @@
+2009-03-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.5.0 (prerelease & stable)
+ disable snapshot, as no longer available
+ new website & urls
+ LICENSE now LGPL
+ * PREPARE: remove snapshot option
+ * grind.diff: deleted
+ * PRE_BUILD: don't apply patch
+
2009-02-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.5.0-rc1 (prerelease)
4.5.0 ( snapshot )
diff --git a/x11-toolkits/qt4/PREPARE b/x11-toolkits/qt4/PREPARE
index d0198b7..5e2fd62 100755
--- a/x11-toolkits/qt4/PREPARE
+++ b/x11-toolkits/qt4/PREPARE
@@ -1 +1 @@
-config_query_list QT_VER "which version to build?" stable prerelease snapshot
+config_query_list QT_VER "which version to build?" stable prerelease
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 45eaeb5..6ee57a9 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,8 +1,5 @@
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
deleted file mode 100644
index dd258a3..0000000
--- a/x11-toolkits/qt4/grind.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-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);




Archive powered by MHonArc 2.6.24.

Top of Page