Source Mage code commit list

[Thomas Orgis <scm AT sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 kde4-apps/calligra/BUILD     |    2 +-
 kde4-apps/calligra/CONFIGURE |    2 +-
 kde4-apps/calligra/DEPENDS   |    3 +++
 kde4-apps/calligra/HISTORY   |    5 +++++
 4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 2d788f704cc2e60a1a22a82538d0014167f2593b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    calligra: use non-empty value for KTINY to properly remember a "no"

commit dda57746ced9352337bbe05c91cc9543363fb002
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    calligra: really add vc to DEPENDS

commit e833ddb33bbead8a7beb303138d529f21e0839a3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    calligra: add vc as optional dependency

diff --git a/kde4-apps/calligra/BUILD b/kde4-apps/calligra/BUILD
index 2b28a23..ef3da71 100755
--- a/kde4-apps/calligra/BUILD
+++ b/kde4-apps/calligra/BUILD
@@ -1,4 +1,4 @@
-OPTS+=" $KTINY" &&
+[[ "$KTINY" = off ]] || OPTS +=" $KTINY" &&
 OPTS+=" -DQT3SUPPORT=$QT3" &&
 if [[ $KDE_NEPOMUK == n ]];then
   OPTS+=" -DNEPOMUK=off"
diff --git a/kde4-apps/calligra/CONFIGURE b/kde4-apps/calligra/CONFIGURE
index 30e5172..d81779e 100755
--- a/kde4-apps/calligra/CONFIGURE
+++ b/kde4-apps/calligra/CONFIGURE
@@ -1,3 +1,3 @@
 source  $SECTION_DIRECTORY/KDE_CONFIGURE  &&
-config_query_option KTINY 'build tiny suite - Words/Tables/Stage' y  
'-DTINY=1' ''
+config_query_option KTINY 'build tiny suite - Words/Tables/Stage' y  
'-DTINY=1' 'off'
 config_query_option QT3 'build parts which use Qt3 support?' n 'on' 'off'
diff --git a/kde4-apps/calligra/DEPENDS b/kde4-apps/calligra/DEPENDS
index 0c2325a..0936411 100755
--- a/kde4-apps/calligra/DEPENDS
+++ b/kde4-apps/calligra/DEPENDS
@@ -27,7 +27,10 @@ depends icu    &&
 depends sqlite &&
 optional_depends mysql          '' '' 'import MySql to Kexi'      &&
 optional_depends postgresql     '' '' 'import Postgresql to Kexi' &&
+# Krita and Sheets
+depends eigen2 &&
 #Krita
+optional_depends vc             '' '' 'explicit SIMD optimization' &&
 optional_depends libkdcraw      '' '' 'process RAW photos'      &&
 optional_depends glew           '' '' 'OpenGL shaders in Krita' &&
 optional_depends gmm            '' '' 'Krita panorama plugin' &&
diff --git a/kde4-apps/calligra/HISTORY b/kde4-apps/calligra/HISTORY
index 52fca1a..18e7bd8 100644
--- a/kde4-apps/calligra/HISTORY
+++ b/kde4-apps/calligra/HISTORY
@@ -1,3 +1,8 @@
+2014-09-07 Thomas Orgis <sobukus AT sourcemage.org>
+       * DEPENDS: eigen2 needed for Krita and Sheets, vc for SIMD
+       * CONFIGURE, BUILD: provide non-empty value for KTINY when not chosen,
+         otherwise this choice is never remembered (sorcery bug or feature?)
+
 2013-03-14 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 2.6.2