sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (256e09f23ab4749770db0234042c2c495dd2bb96)
- 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 (256e09f23ab4749770db0234042c2c495dd2bb96)
- Date: Sun, 4 May 2008 06:33:44 -0500
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
x11-toolkits/qt4/BUILD | 6 +-----
x11-toolkits/qt4/CONFIGURE | 9 +++------
x11-toolkits/qt4/DETAILS | 8 ++++----
x11-toolkits/qt4/HISTORY | 4 ++++
4 files changed, 12 insertions(+), 15 deletions(-)
New commits:
commit 83e1dd035c83b36e21d872ff212ec4a2a73a8d04
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
"qt4-4.4.0"
diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index 07aaef0..9759297 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -12,13 +12,9 @@ OPTS="$QT_DEBUG \
$QT_EXAMPLE examples \
$QT_TOOLS tools \
$QT_TRANS translations \
+ $QT_WEBKIT \
$OPTS" &&
-if [[ $QT_VER == 'snapshot' || $QT_VER == 'prerelease' ]]
-then
- OPTS="$QT_WEBKIT $OPTS"
-fi &&
-
./configure -confirm-license
\
-prefix "$INSTALL_ROOT/usr"
\
-bindir "$INSTALL_ROOT/usr/bin/qt4"
\
diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index e9e5eca..5b1fa0e 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -44,12 +44,9 @@ config_query_option QT_PCH 'Enable precompiled header
support?' y \
'-pch' \
'-no-pch' &&
-if [[ $QT_VER == 'snapshot' || $QT_VER == 'prerelease' ]]
-then
- config_query_option QT_WEBKIT 'Build the WebKit module?' y \
- '-webkit' \
- '-no-webkit'
-fi &&
+config_query_option QT_WEBKIT 'Build the WebKit module?' y \
+ '-webkit' \
+ '-no-webkit' &&
# change the old options to the new, can be removed after a year --20080105
QT_DEMO="${QT_DEMO//demos/}" &&
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 81e05b7..ace3e30 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -9,16 +9,16 @@ case $QT_VER in
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
;;
prerelease)
- VERSION=4.4.0-rc1
-
SOURCE_HASH=sha512:e4366ec41e1e4f92d47002ce2c4d2c007eb534c19a861b7389a2097c3a2a539114ae4f0d52310661faa1b62056b14fc7df25e958be3ca151f6d8ac42cfdc7f39
+ VERSION=4.4.0
+
SOURCE_HASH=sha512:c4cdaf48c01950f6fc71226fd9d54b97571f5a65c68c27f345f3ad4188c9adc5fd4380e97167a609714401da6a4961cd4eb33842cb2c4ddb83e187711dce12f3
SOURCE=${SPELLX}-$VERSION.tar.bz2
URI=qt/source/$SOURCE
SECURITY_PATCH=2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-$VERSION
;;
*) #stable
- VERSION=4.3.4
-
SOURCE_HASH=sha512:65221342c658334b9fbf175a98047853a3216c495397b419c2ee0be2011c4b1189183957b366ed4fa1fed7dd912e0a1d70ee1fcff42a8d6e4871598bdcfafbfb
+ VERSION=4.4.0
+
SOURCE_HASH=sha512:c4cdaf48c01950f6fc71226fd9d54b97571f5a65c68c27f345f3ad4188c9adc5fd4380e97167a609714401da6a4961cd4eb33842cb2c4ddb83e187711dce12f3
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 32c86da..82738fb 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2008-05-04 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.4.0 (prerelease & stable)
+ * DEPENDS, CONFIGURE, BUILD: WEBKIT now in all versions
+
2008-05-01 Treeve Jelbert <treeve AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS:
add SQLITE
-
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (256e09f23ab4749770db0234042c2c495dd2bb96),
Treeve Jelbert, 05/04/2008
- Re: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (256e09f23ab4749770db0234042c2c495dd2bb96), Ladislav Hagara, 05/04/2008
Archive powered by MHonArc 2.6.24.