sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (60daedf2d60883f2cf1419c9ed7e5aa4a0f7adba)

From: Juuso Alasuutari <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (60daedf2d60883f2cf1419c9ed7e5aa4a0f7adba)
Date: Thu, 27 Mar 2008 06:08:47 -0500

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

x11-toolkits/qt4/BUILD | 60
+++++++++++++++++++++++----------------------
x11-toolkits/qt4/CONFIGURE | 30 +++++++++++++---------
x11-toolkits/qt4/DETAILS | 2 -
x11-toolkits/qt4/HISTORY | 7 +++++
4 files changed, 57 insertions(+), 42 deletions(-)

New commits:
commit 60daedf2d60883f2cf1419c9ed7e5aa4a0f7adba
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

qt4: Added an explicit WebKit module query for snapshot and prerelease
versions. Some formatting improvements on
the side.

commit a044d0239f0a1a13e6d7a75600501c94fc5a71c1
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

qt4: Updated snapshot version to 4.4.1.

diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index dc1b5f8..07aaef0 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -1,34 +1,36 @@
-export QTDIR=$SOURCE_DIRECTORY &&
-export LD_LIBRARY_PATH=$SOURCE_DIRECTORY/lib:$LD_LIBRARY_PATH &&
+export QTDIR="$SOURCE_DIRECTORY" &&
+export LD_LIBRARY_PATH="$SOURCE_DIRECTORY/lib:$LD_LIBRARY_PATH" &&

-OPTS="$QT_DEBUG \
- $QT_NIS \
- $QT_XRAMA \
- $QT_GIF \
- $QT_EXCEPT \
- $QT_PCH \
- $QT_QT3 \
- $QT_DEMO demos \
- $QT_EXAMPLE examples \
- $QT_TOOLS tools \
+OPTS="$QT_DEBUG \
+ $QT_NIS \
+ $QT_XRAMA \
+ $QT_GIF \
+ $QT_EXCEPT \
+ $QT_PCH \
+ $QT_QT3 \
+ $QT_DEMO demos \
+ $QT_EXAMPLE examples \
+ $QT_TOOLS tools \
$QT_TRANS translations \
- $OPTS" &&
-if [[ x${QT_DEBUG} == "x" ]];then
- OPTS="-no-separate-debug-info ${OPTS}"
-fi &&
+ $OPTS" &&

-./configure -confirm-license
\
- -prefix $INSTALL_ROOT/usr
\
- -bindir $INSTALL_ROOT/usr/bin/qt4
\
- -docdir $INSTALL_ROOT/usr/share/doc/qt4
\
- -plugindir $INSTALL_ROOT/usr/lib/qt4/plugins
\
- -sysconfdir $INSTALL_ROOT/etc/qt4
\
- -translationdir
$INSTALL_ROOT//usr/share/doc/qt4/translations \
- -examplesdir
$INSTALL_ROOT/usr/share/doc/qt4/examples \
- -demosdir $INSTALL_ROOT/usr/share/doc/qt4/demos
\
- -datadir $INSTALL_ROOT/usr/share/qt4
\
- -platform linux-g++
\
- -stl
\
- $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"
\
+ -docdir "$INSTALL_ROOT/usr/share/doc/qt4"
\
+ -plugindir "$INSTALL_ROOT/usr/lib/qt4/plugins"
\
+ -sysconfdir "$INSTALL_ROOT/etc/qt4"
\
+ -translationdir
"$INSTALL_ROOT//usr/share/doc/qt4/translations" \
+ -examplesdir "$INSTALL_ROOT/usr/share/doc/qt4/examples"
\
+ -demosdir "$INSTALL_ROOT/usr/share/doc/qt4/demos"
\
+ -datadir "$INSTALL_ROOT/usr/share/qt4"
\
+ -platform linux-g++
\
+ -stl
\
+ $OPTS
&&

make
diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index aa601da..e9e5eca 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -1,20 +1,20 @@
config_query QT_DOC 'install documents(very big)?' n &&

config_query_option QT_DEMO 'install demos?' n \
- '-make' \
- '-nomake' &&
+ '-make' \
+ '-nomake' &&

config_query_option QT_EXAMPLE 'install examples?' n \
- '-make' \
- '-nomake' &&
+ '-make' \
+ '-nomake' &&

config_query_option QT_TOOLS 'install tools?' y \
- '-make' \
- '-nomake' &&
+ '-make' \
+ '-nomake' &&

config_query_option QT_TRANS 'install translations?' n \
- '-make' \
- '-nomake' &&
+ '-make' \
+ '-nomake' &&

config_query_option QT_QT3 'build qt3 support?' y \
'-qt3support' \
@@ -22,7 +22,7 @@ config_query_option QT_QT3 'build qt3 support?' y
\

config_query_option QT_DEBUG 'Compile with debugging symbols?' n \
'-debug' \
- '' &&
+ '-no-separate-debug-info' &&

config_query_option QT_NIS 'Enable Network Information Services?' y \
'-nis' \
@@ -36,14 +36,20 @@ config_query_option QT_GIF 'Enable GIF support?'
y \
'-qt-gif' \
'-no-gif' &&

-
-config_query_option QT_EXCEPT 'Disable exception checking' n \
+config_query_option QT_EXCEPT 'Disable exception checking' n \
'-no-exceptions' \
'-exceptions' &&

config_query_option QT_PCH 'Enable precompiled header support?' y \
'-pch' \
- '-no-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 &&

# 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 1380a7a..cacb064 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,7 +2,7 @@
SPELLX=qt-x11-opensource-src
case $QT_VER in
snapshot)
- VERSION=4.4.0-snapshot-$(date +%Y%m%d)
+ VERSION=4.4.1-snapshot-$(date +%Y%m%d)
SOURCE_IGNORE=volatile
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/snapshots/$SOURCE
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 757459d..68e714e 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,10 @@
+2008-03-27 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DETAILS: Update snapshot to 4.4.1.
+ * CONFIGURE: Added query for WebKit module, added negative
+ flag to QT_DEBUG, improved formatting.
+ * BUILD: Added WebKit option to OPTS, quoted path strings,
+ removed redundant QT_DEBUG conditional, improved formatting.
+
2008-03-17 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Corrected invalid snapshot SOURCE.

[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (60daedf2d60883f2cf1419c9ed7e5aa4a0f7adba), Juuso Alasuutari, 03/27/2008