Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 database/firebird3/DEPENDS  |    7 ++-----
 database/firebird3/HISTORY  |    3 +++
 kde4-support/phonon/DEPENDS |    5 ++---
 kde4-support/phonon/HISTORY |    3 +++
 qt5/qtbase/DEPENDS          |    9 ++++-----
 qt5/qtbase/HISTORY          |    4 ++++
 qt5/qtbase/PRE_SUB_DEPENDS  |    2 +-
 qt5/qtbase/SUB_DEPENDS      |    5 ++---
 8 files changed, 21 insertions(+), 17 deletions(-)

New commits:
commit 86cd6d984b5d8e2afe1aeea001d0fbd521ee777c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qtbase - tweak SUB_DEPENDS

commit 06fb582000ed6b7a270ad387bddbba73359c5347
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    phonon - tweak depends

commit cbac623f0fb579557973fdf65bdd625944c190fb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    firebird3 - tweak depends

diff --git a/database/firebird3/DEPENDS b/database/firebird3/DEPENDS
index 11043a7..4b0855c 100755
--- a/database/firebird3/DEPENDS
+++ b/database/firebird3/DEPENDS
@@ -1,9 +1,6 @@
-depends cmake      &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
 depends icu        &&
 depends libedit    &&
 depends libtommath &&
-depends zlib       &&
-if [[ $CMAKE_GEN == Ninja ]];then
-  depends ninja-build-system
-fi
+depends zlib
 
diff --git a/database/firebird3/HISTORY b/database/firebird3/HISTORY
index dd7867f..fd8461c 100644
--- a/database/firebird3/HISTORY
+++ b/database/firebird3/HISTORY
@@ -1,3 +1,6 @@
+2016-04-13 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: use CMAKE_DEPENDS
+
 2016-01-07 Treeve Jelbert <treeve AT sourcemage.org>
        * PRE_BUILD, fbdiff, DEPENDS: use system libedit, libtomath
 
diff --git a/kde4-support/phonon/DEPENDS b/kde4-support/phonon/DEPENDS
index 7cd78cf..9c8ca58 100755
--- a/kde4-support/phonon/DEPENDS
+++ b/kde4-support/phonon/DEPENDS
@@ -1,8 +1,7 @@
 if [[ $PHONON_VER == devel ]]; then
 depends  subversion
-fi
-depends  cmake       &&
-depends  ninja-build-system &&
+fi &&
+source $GRIMOIRE/CMAKE_DEPENDS &&
 depends  automoc     &&
 depends -sub CXX gcc         &&
 depends  qt4      &&
diff --git a/kde4-support/phonon/HISTORY b/kde4-support/phonon/HISTORY
index a417391..612c30e 100644
--- a/kde4-support/phonon/HISTORY
+++ b/kde4-support/phonon/HISTORY
@@ -1,3 +1,6 @@
+2016-04-13 Treeve Jelbert <treeve AT sourcemage.org>
+       * DEPENDS: use CMAKE_DEPENDS
+
 2016-03-02 Thomas Orgis <sobukus AT sourcemage.org>
        * DEPENDS: fails without its ninja
 
diff --git a/qt5/qtbase/DEPENDS b/qt5/qtbase/DEPENDS
index 20723c3..da2f7bd 100755
--- a/qt5/qtbase/DEPENDS
+++ b/qt5/qtbase/DEPENDS
@@ -1,4 +1,3 @@
-depends -sub CXX gcc &&
 depends  perl  &&
 depends  zlib        &&
 depends  libx11      &&
@@ -73,7 +72,7 @@ optional_depends  FIREBIRD               \
                   '-no-sql-ibase'        \
                   'Firebird database support'  &&
 
-optional_depends  mysql                  \
+optional_depends  MYSQL                  \
                   "-plugin-sql-mysql"    \
                   '-no-sql-mysql'        \
                   'MySql database support'     &&
@@ -112,9 +111,9 @@ fi &&
 optional_depends freetype2  '-system-freetype' '-no-freetype' 'Freetype2 
support' &&
 
 #qt5.5
-#optional_depends gstreamer-1.0 '-gstreamer' '-no-gstreamer' 'GStreamer 
support' &&
-#optional_depends libinput   '-libinput' '-no-libinput' 'LibInput support' &&
-#optional_depends libproxy   '-libproxy' '-no-libproxy' 'Network Proxy 
support' &&
+optional_depends gst-plugins-base-1.0 '-gstreamer' '-no-gstreamer' 
'GStreamer support' &&
+optional_depends libinput   '-libinput' '-no-libinput' 'LibInput support' &&
+optional_depends libproxy   '-libproxy' '-no-libproxy' 'Network Proxy 
support' &&
 optional_depends mtdev      '-mtdev' '-no-mtdev' 'Enable multitouch support' 
&&
 optional_depends alsa-lib   '-alsa' '-no-alsa' 'ALSA support' &&
 optional_depends pulseaudio '-pulseaudio' '-no-pulseaudio' 'PulseAudio sound 
support'
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 0381b8a..f73da11 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,7 @@
+2016-04-13 Treeve Jelbert <treeve AT sourcemage.org>
+       * PRE_SUB_DEPENDS SUB_DEPENDS: improve MYSQL
+       * DEPENDS: more
+
 2016-03-28 Treeve Jelbert <treeve AT sourcemage.org>
         * CONFLICTS: added, all qt5 spells should self-conflict
 2016-03-16 Treeve Jelbert <treeve AT sourcemage.org>
diff --git a/qt5/qtbase/PRE_SUB_DEPENDS b/qt5/qtbase/PRE_SUB_DEPENDS
index b6a6106..57dff80 100755
--- a/qt5/qtbase/PRE_SUB_DEPENDS
+++ b/qt5/qtbase/PRE_SUB_DEPENDS
@@ -3,7 +3,7 @@ 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;;
+  MYSQL)  is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL) && 
return 0;;
   POSTGRESQL)  is_depends_enabled $SPELL postgresql && return 0;;
   SQLITE)  is_depends_enabled $SPELL sqlite && return 0;;
   ODBC)  is_depends_enabled $SPELL ODBC-MGR && return 0;;
diff --git a/qt5/qtbase/SUB_DEPENDS b/qt5/qtbase/SUB_DEPENDS
index c9bd78f..c54b0f2 100755
--- a/qt5/qtbase/SUB_DEPENDS
+++ b/qt5/qtbase/SUB_DEPENDS
@@ -17,8 +17,7 @@ FIREBIRD) echo "Firebird support requested, forcing it" &&
 POSTGRESQL) echo "Postresql support requested, forcing it" &&
      depends postgresql '-plugin-sql-psql'
      ;;
-SQLITE) echo "Sqlite support requested, forcing it" &&
-     depends sqlite '-system-sqlite'
+SQLITE) depends sqlite '-system-sqlite'
       ;;
 ODBC) echo "Odbc support requested, forcing it" &&
      depends ODBC-MGR '-plugin-sql-odbc'
@@ -27,7 +26,7 @@ SSL) echo "SSL support requested, forcing it" &&
      depends SSL
       ;;
 MYSQL) echo "MySQL support requested, forcing mysql dependency." &&
-       depends mysql "-plugin-sql-mysql"
+       depends MYSQL "-plugin-sql-mysql"
        ;;
 GTK) if [[  $QT_GTK == "-no-gtkstyle" ]]; then
           echo "GTK theme integration requested, forcing it"  &&