Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (4b323ec3378835e603856eda82a150490e1e828f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (4b323ec3378835e603856eda82a150490e1e828f)
  • Date: Fri, 9 Jan 2009 15:25:23 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

kde4/akonadi/DEPENDS | 2 +-
kde4/akonadi/HISTORY | 3 +++
x11-toolkits/qt4/HISTORY | 3 +++
x11-toolkits/qt4/PRE_SUB_DEPENDS | 1 +
x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS | 1 +
x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS | 22 +++++++++++++++++-----
x11-toolkits/qt4/SUB_DEPENDS | 4 ++++
7 files changed, 30 insertions(+), 6 deletions(-)

New commits:
commit 4b323ec3378835e603856eda82a150490e1e828f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

akonadi: Depends on qt4 built with mysql support

commit 284adaf94e0def16bb4c388f3d68047de28176e1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qt4: Add forcing mysql dependency
Update tablet files for SUB_DEPENDS and PRE_SUB_DEPENDS with this change
and prior missing changes

diff --git a/kde4/akonadi/DEPENDS b/kde4/akonadi/DEPENDS
index 81019f6..04c78ec 100755
--- a/kde4/akonadi/DEPENDS
+++ b/kde4/akonadi/DEPENDS
@@ -1,4 +1,4 @@
-depends -sub DBUS qt4 &&
+depends -sub "DBUS MYSQL" qt4 &&
depends -sub PROGRAM_OPTIONS boost &&
depends g++ &&
depends cmake &&
diff --git a/kde4/akonadi/HISTORY b/kde4/akonadi/HISTORY
index 716819a..562429d 100644
--- a/kde4/akonadi/HISTORY
+++ b/kde4/akonadi/HISTORY
@@ -1,3 +1,6 @@
+2009-01-09 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Depends on qt4 built with mysql support
+
2009-01-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: fix truncated hash

diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index e9f4d84..f935d35 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+2009-01-09 Eric Sandall <sandalle AT sourcemage.org>
+ * SUB_DEPENDS, PRE_SUB_DEPENDS: Add forcing mysql dependency
+
2008-12-11 Treeve Jelbert <treeve AT sourcemage.org>
DEPENDS: make stl support specific
remove xorg-libs
diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS
b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index 0e12325..5ddd8cc 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -6,6 +6,7 @@ case $THIS_SUB_DEPENDS in
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 0e12325..5ddd8cc 100755
--- a/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/REPAIR^all^PRE_SUB_DEPENDS
@@ -6,6 +6,7 @@ case $THIS_SUB_DEPENDS in
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 dd3531c..dfd7125 100755
--- a/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
+++ b/x11-toolkits/qt4/REPAIR^all^SUB_DEPENDS
@@ -8,6 +8,9 @@ DBUS) echo "DBUS support requested, forcing dbus dependency."
&&
OPENGL) echo "OPENGL support requested, forcing OPENGL dependency." &&
depends OPENGL
;;
+SQLITE) echo "Sqlite support requested, forcing sqlite dependency." &&
+ depends sqlite
+ ;;
SSL) echo "SSL support requested, forcing openssl dependency." &&
depends openssl
;;
@@ -15,11 +18,20 @@ TOOLS) if [[ $QT_TOOLS == "-nomake" ]]; then
echo "Tools requested, forcing build." &&
QT_TOOLS="-make"
fi
+ ;;
+QT3) if [[ $QT_QT3 == "-no-qt3support" ]]; then
+ echo "Qt3 support requested, forcing build." &&
+ QT_QT3="-qt3support"
+ fi
;;
-QT3) if [[ $QT_QT3 == "-no-qt3support" ]];then
- echo "Qt3 support requested, forcing rebuild." &&
- QT_QT3="-qt3support"
- fi
- ;;
+WEBKIT) if [[ $QT_WEBKIT == "-no-webkit" ]]; then
+ echo "WebKit module requested, forcing build." &&
+ QT_WEBKIT="-webkit"
+ fi
+ ;;
+MYSQL) echo "MySQL support requested, forcing mysql dependency." &&
+ depends mysql "-plugin-sql-mysql -I$INSTALL_ROOT/usr/include/mysql \
+ -L$INSTALL_ROOT/usr/lib -lmysqlclient"
+ ;;
*) echo unknown sub-depends!!! ; return 1 ;;
esac
diff --git a/x11-toolkits/qt4/SUB_DEPENDS b/x11-toolkits/qt4/SUB_DEPENDS
index 201cdd6..dfd7125 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -29,5 +29,9 @@ WEBKIT) if [[ $QT_WEBKIT == "-no-webkit" ]]; then
QT_WEBKIT="-webkit"
fi
;;
+MYSQL) echo "MySQL support requested, forcing mysql dependency." &&
+ depends mysql "-plugin-sql-mysql -I$INSTALL_ROOT/usr/include/mysql \
+ -L$INSTALL_ROOT/usr/lib -lmysqlclient"
+ ;;
*) echo unknown sub-depends!!! ; return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (4b323ec3378835e603856eda82a150490e1e828f), Eric Sandall, 01/09/2009

Archive powered by MHonArc 2.6.24.

Top of Page