Skip to Content.
Sympa Menu

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

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 (a8db093e9e0452f5f392697bfc6119774e4025ee)
  • Date: Sat, 10 Jan 2009 03:01:28 -0600

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

x11-toolkits/qt4/HISTORY | 4 ++++
x11-toolkits/qt4/PRE_SUB_DEPENDS | 4 +++-
x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS | 4 +++-
x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS | 10 ++++++++++
x11-toolkits/qt4/SUB_DEPENDS | 10 ++++++++++
5 files changed, 30 insertions(+), 2 deletions(-)

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

qt4 - additional subdepends

diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index f935d35..83506b7 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+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
+
2009-01-09 Eric Sandall <sandalle AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS: Add forcing mysql dependency

diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS
b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index 5ddd8cc..b00603f 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -1,12 +1,14 @@
case $THIS_SUB_DEPENDS in
DBUS) is_depends_enabled $SPELL dbus && return 0;;
OPENGL) is_depends_enabled $SPELL $(get_spell_provider $SPELL OPENGL) &&
return 0;;
+ FIREBIRD) is_depends_enabled $SPELL firebird && return 0;;
+ MYSQL) is_depends_enabled $SPELL mysql && return 0;;
+ POSTGRESQL) is_depends_enabled $SPELL postgresql && return 0;;
SQLITE) is_depends_enabled $SPELL sqlite && return 0;;
SSL) is_depends_enabled $SPELL openssl && return 0;;
TOOLS) [[ $QT_TOOLS == "-make" ]] && return 0;;
QT3) [[ $QT_QT3 == "-qt3support" ]] && return 0;;
WEBKIT) [[ $QT_WEBKIT == "-webkit" ]] && return 0;;
- MYSQL) is_depends_enabled $SPELL mysql && return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
index 5ddd8cc..b00603f 100755
--- a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,12 +1,14 @@
case $THIS_SUB_DEPENDS in
DBUS) is_depends_enabled $SPELL dbus && return 0;;
OPENGL) is_depends_enabled $SPELL $(get_spell_provider $SPELL OPENGL) &&
return 0;;
+ FIREBIRD) is_depends_enabled $SPELL firebird && return 0;;
+ MYSQL) is_depends_enabled $SPELL mysql && return 0;;
+ POSTGRESQL) is_depends_enabled $SPELL postgresql && return 0;;
SQLITE) is_depends_enabled $SPELL sqlite && return 0;;
SSL) is_depends_enabled $SPELL openssl && return 0;;
TOOLS) [[ $QT_TOOLS == "-make" ]] && return 0;;
QT3) [[ $QT_QT3 == "-qt3support" ]] && return 0;;
WEBKIT) [[ $QT_WEBKIT == "-webkit" ]] && return 0;;
- MYSQL) is_depends_enabled $SPELL mysql && return 0;;
*) echo "Eek, unknown subdependency requested!"; return 1;;
esac
return 1
diff --git a/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
b/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
index dfd7125..2495c82 100755
--- a/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
+++ b/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
@@ -8,6 +8,16 @@ DBUS) echo "DBUS support requested, forcing dbus
dependency." &&
OPENGL) echo "OPENGL support requested, forcing OPENGL dependency." &&
depends OPENGL
;;
+FIREBIRD) echo "Firebird support requested, forcing firebird dependency." &&
+ depends firebird \
+ "-plugin-sql-ibase -I$INSTALL_ROOT/opt/firebird/include \
+ -L$INSTALL_ROOT/opt/firebird/lib"
+ ;;
+POSTGRESQL) echo "Postresql support requested, forcing postgresql
dependency." &&
+ depends postgresql \
+ "-plugin-sql-psql -I$INSTALL_ROOT/src/include/postgresql
\
+ -I$INSTALL_ROOT/usr/include/server/libpq
-L$INSTALL_ROOT/usr/lib -lpq"
+ ;;
SQLITE) echo "Sqlite support requested, forcing sqlite dependency." &&
depends sqlite
;;
diff --git a/x11-toolkits/qt4/SUB_DEPENDS b/x11-toolkits/qt4/SUB_DEPENDS
index dfd7125..2495c82 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -8,6 +8,16 @@ DBUS) echo "DBUS support requested, forcing dbus
dependency." &&
OPENGL) echo "OPENGL support requested, forcing OPENGL dependency." &&
depends OPENGL
;;
+FIREBIRD) echo "Firebird support requested, forcing firebird dependency." &&
+ depends firebird \
+ "-plugin-sql-ibase -I$INSTALL_ROOT/opt/firebird/include \
+ -L$INSTALL_ROOT/opt/firebird/lib"
+ ;;
+POSTGRESQL) echo "Postresql support requested, forcing postgresql
dependency." &&
+ depends postgresql \
+ "-plugin-sql-psql -I$INSTALL_ROOT/src/include/postgresql
\
+ -I$INSTALL_ROOT/usr/include/server/libpq
-L$INSTALL_ROOT/usr/lib -lpq"
+ ;;
SQLITE) echo "Sqlite support requested, forcing sqlite dependency." &&
depends sqlite
;;



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a8db093e9e0452f5f392697bfc6119774e4025ee), Treeve Jelbert, 01/10/2009

Archive powered by MHonArc 2.6.24.

Top of Page