sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (76a8ea879e4d3d926a1f15392da64981b6923132)

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 (76a8ea879e4d3d926a1f15392da64981b6923132)
Date: Sat, 31 Jan 2009 07:15:33 -0600

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

x11-toolkits/qt4/BUILD | 2 +-
x11-toolkits/qt4/CONFIGURE | 4 ++++
x11-toolkits/qt4/DEPENDS | 5 -----
x11-toolkits/qt4/HISTORY | 7 +++++++
x11-toolkits/qt4/PRE_SUB_DEPENDS | 1 +
x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS | 1 +
x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS | 5 +++++
x11-toolkits/qt4/SUB_DEPENDS | 5 +++++
8 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit 76a8ea879e4d3d926a1f15392da64981b6923132
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

qt4: Fix STL support, add sub-dependency for it.

diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index 9759297..9de1995 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -7,6 +7,7 @@ OPTS="$QT_DEBUG \
$QT_GIF \
$QT_EXCEPT \
$QT_PCH \
+ $QT_STL \
$QT_QT3 \
$QT_DEMO demos \
$QT_EXAMPLE examples \
@@ -26,7 +27,6 @@ OPTS="$QT_DEBUG \
-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 5b1fa0e..9a693fb 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -16,6 +16,10 @@ config_query_option QT_TRANS 'install translations?' n
\
'-make' \
'-nomake' &&

+config_query_option QT_STL 'build STL support?' y \
+ '-stl' \
+ '-no-stl' &&
+
config_query_option QT_QT3 'build qt3 support?' y \
'-qt3support' \
'-no-qt3support' &&
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index 46e3f72..7eb759a 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -37,11 +37,6 @@ optional_depends libpng \
'-qt-libpng' \
'to use the system png library' &&

-optional_depends stlport \
- '-stl' \
- '-no-stl' \
- 'for stlport support' &&
-
optional_depends firebird \
"-plugin-sql-ibase -I$INSTALL_ROOT/opt/firebird/include \
-L$INSTALL_ROOT/opt/firebird/lib" \
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 83506b7..ec387de 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,10 @@
+2009-01-31 Juuso Alasuutari <iuso AT sourcemage.org>
+ * DEPENDS: Remove optional_depends stlport.
+ * BUILD: Remove forced -stl flag.
+ * CONFIGURE, BUILD: Add query for STL support.
+ * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^all^SUB_DEPENDS,
+ REPAIR^all^PRE_SUB_DEPENDS: Add STL sub-dependency.
+
2009-01-09 Treeve Jelbert <treeve AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPEND, REPAIR^all^PRE_SUB_DEPENDS
REPAIR^all^SUB_DEPENDS: add firebird & postgresql
diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS
b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index b00603f..bde8deb 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -7,6 +7,7 @@ case $THIS_SUB_DEPENDS in
SQLITE) is_depends_enabled $SPELL sqlite && return 0;;
SSL) is_depends_enabled $SPELL openssl && return 0;;
TOOLS) [[ $QT_TOOLS == "-make" ]] && return 0;;
+ STL) [[ $QT_STL == "-stl" ]] && return 0;;
QT3) [[ $QT_QT3 == "-qt3support" ]] && return 0;;
WEBKIT) [[ $QT_WEBKIT == "-webkit" ]] && return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
diff --git a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
index b00603f..bde8deb 100755
--- a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
@@ -7,6 +7,7 @@ case $THIS_SUB_DEPENDS in
SQLITE) is_depends_enabled $SPELL sqlite && return 0;;
SSL) is_depends_enabled $SPELL openssl && return 0;;
TOOLS) [[ $QT_TOOLS == "-make" ]] && return 0;;
+ STL) [[ $QT_STL == "-stl" ]] && return 0;;
QT3) [[ $QT_QT3 == "-qt3support" ]] && return 0;;
WEBKIT) [[ $QT_WEBKIT == "-webkit" ]] && return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
diff --git a/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
b/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
index 2495c82..81a17ec 100755
--- a/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
+++ b/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
@@ -29,6 +29,11 @@ TOOLS) if [[ $QT_TOOLS == "-nomake" ]]; then
QT_TOOLS="-make"
fi
;;
+STL) if [[ $QT_STL == "-no-stl" ]]; then
+ echo "STL support requested, forcing build." &&
+ QT_STL="-stl"
+ fi
+ ;;
QT3) if [[ $QT_QT3 == "-no-qt3support" ]]; then
echo "Qt3 support requested, forcing build." &&
QT_QT3="-qt3support"
diff --git a/x11-toolkits/qt4/SUB_DEPENDS b/x11-toolkits/qt4/SUB_DEPENDS
index 2495c82..81a17ec 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -29,6 +29,11 @@ TOOLS) if [[ $QT_TOOLS == "-nomake" ]]; then
QT_TOOLS="-make"
fi
;;
+STL) if [[ $QT_STL == "-no-stl" ]]; then
+ echo "STL support requested, forcing build." &&
+ QT_STL="-stl"
+ fi
+ ;;
QT3) if [[ $QT_QT3 == "-no-qt3support" ]]; then
echo "Qt3 support requested, forcing build." &&
QT_QT3="-qt3support"

[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (76a8ea879e4d3d926a1f15392da64981b6923132), Juuso Alasuutari, 01/31/2009