Source Mage code commit list

[Sukneet Basuta <scm AT sourcemage.org>]

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

 java/antlr/HISTORY                    |    4 ++++
 java/antlr/PRE_SUB_DEPENDS            |    6 ++++++
 java/antlr/REPAIR^all^PRE_SUB_DEPENDS |    6 ++++++
 java/antlr/SUB_DEPENDS                |    6 ++++++
 kde4/kdesdk4/BUILD                    |   10 ++++++++++
 kde4/kdesdk4/CONFIGURE                |    3 ++-
 kde4/kdesdk4/DEPENDS                  |   23 +++++++++++++++++++++--
 kde4/kdesdk4/DETAILS                  |    4 ++--
 kde4/kdesdk4/HISTORY                  |   11 +++++++++++
 9 files changed, 68 insertions(+), 5 deletions(-)

New commits:
commit 600d6654ad05eb0eba73ca796423f595fa162b8b
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

    kdesdk4: => 4.8.4
    
    * CONFIGURE: added query for umbrello
    
    * DEPENDS: added depends strigi.
               added depends libxslt, libxml2, & boost if umbrello enabled.
               added optional_depends hunspell, qca2, antlr, kdebase4. Note 
that : is replaced with @ in the flags since sorcery uses : as delimiters.
               removed optional_depends db.
    
    * BUILD: added, to add svn flags if SVN enabled/disabled.
             replace @ with : in OPTS

commit 2674392074fb77c2d96190f9bb6658126529c541
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

    antlr: SUB_DEPENDS added to force JAVA optional_depends

diff --git a/java/antlr/HISTORY b/java/antlr/HISTORY
index b347d88..7d882db 100644
--- a/java/antlr/HISTORY
+++ b/java/antlr/HISTORY
@@ -1,3 +1,7 @@
+2012-07-29 Sukneet Basuta <sukneet AT sourcemage.org>
+       * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS: added,
+         to force JAVA optional_depends
+
 2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: changed dependency on g++ to dependency on gcc with
          sub-depends on CXX (scripted)
diff --git a/java/antlr/PRE_SUB_DEPENDS b/java/antlr/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..38770c0
--- /dev/null
+++ b/java/antlr/PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+    JAVA) is_depends_enabled $SPELL $(get_spell_provider $SPELL JAVA);;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1;;
+esac
+
diff --git a/java/antlr/REPAIR^all^PRE_SUB_DEPENDS 
b/java/antlr/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..38770c0
--- /dev/null
+++ b/java/antlr/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+    JAVA) is_depends_enabled $SPELL $(get_spell_provider $SPELL JAVA);;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1;;
+esac
+
diff --git a/java/antlr/SUB_DEPENDS b/java/antlr/SUB_DEPENDS
new file mode 100755
index 0000000..1dd11f7
--- /dev/null
+++ b/java/antlr/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case $THIS_SUB_DEPENDS in
+    JAVA) message "JAVA support requested, forcing JAVA dependency" &&
+          depends JAVA '--enable-java' ;;
+       *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+          return 1;;
+esac
diff --git a/kde4/kdesdk4/BUILD b/kde4/kdesdk4/BUILD
new file mode 100755
index 0000000..730c158
--- /dev/null
+++ b/kde4/kdesdk4/BUILD
@@ -0,0 +1,10 @@
+# replace @ with : for optional dependency flags
+OPTS=${OPTS//@/:} &&
+
+if  [[  "$KDESDK_SUBVERSION"  ==  "y"  ]];  then
+  OPTS="-DWITH_SVN:BOOL=on $OPTS"
+else
+  OPTS="-DWITH_SVN:BOOL=off $OPTS"
+fi &&
+
+default_build
diff --git a/kde4/kdesdk4/CONFIGURE b/kde4/kdesdk4/CONFIGURE
index 29589c3..337f57e 100755
--- a/kde4/kdesdk4/CONFIGURE
+++ b/kde4/kdesdk4/CONFIGURE
@@ -4,5 +4,6 @@ if  provider_ok  APU          &&
   config_query  KDESDK_SUBVERSION  'Build Subversion SCM support?'  y
 else
   config_query  KDESDK_SUBVERSION  'Build Subversion SCM support?'  n
-fi
+fi &&
 
+config_query UMBRELLO "Build Umbrello UML Modeller" y
diff --git a/kde4/kdesdk4/DEPENDS b/kde4/kdesdk4/DEPENDS
index 963abd7..de9d879 100755
--- a/kde4/kdesdk4/DEPENDS
+++ b/kde4/kdesdk4/DEPENDS
@@ -1,8 +1,27 @@
 source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 depends kdepimlibs4                     &&
+depends strigi                          &&
 if  [  "$KDESDK_SUBVERSION"  ==  "y"  ];  then
   depends  APU         &&
   depends  subversion
 fi                                      &&
-optional_depends  db         '' '' 'Berkley DB support'
-#optional_depends  '' '' ''
+
+if [[ $UMBRELLO == "y" ]]; then
+  depends libxslt &&
+  depends libxml2 &&
+  depends boost
+fi &&
+
+# replace @ with : in BUILD
+optional_depends  hunspell       "-DWITH_HUNSPELL@BOOL=on" \
+                                 "-DWITH_HUNSPELL@BOOL=off" \
+                                 "to build Lokalize localization tool" &&
+optional_depends  qca2           "-DWITH_QCA2@BOOL=on" \
+                                 "-DWITH_QCA2@BOOL=off" \
+                                 "for the checksum tool in Okteta hex 
editor" &&
+optional_depends  kdebase4       "-DWITH_LibKonq@BOOL=on" \
+                                 "-DWITH_LibKonq@BOOL=off" \
+                                 "to build the Dolphin version control 
plugins" &&
+optional_depends -sub JAVA antlr "-DWITH_Antlr2@BOOL=on" \
+                                 "-DWITH_Antlr2@BOOL=off" \
+                                 "for support of po2xml and swappo tools"
diff --git a/kde4/kdesdk4/DETAILS b/kde4/kdesdk4/DETAILS
index dbb9ae6..e4d50f2 100755
--- a/kde4/kdesdk4/DETAILS
+++ b/kde4/kdesdk4/DETAILS
@@ -1,7 +1,7 @@
            SPELL=kdesdk4
           SPELLX=${SPELL//4}
-         VERSION=4.8.3
-     
SOURCE_HASH=sha512:b14af6c528c33da17d368dde18b74c9605740c608ee7fbe4e2e91aff78b689de17295b39e766fb58e5d64b414707f590b4f422f39e5badd716a802421cb52b35
+         VERSION=4.8.4
+     
SOURCE_HASH=sha512:a5f52e1bd51fd283902f620e4d0e37030bc6a2e6046632471f7c73482ffc1a491f25356f998514726bd7d3eb13bf386478cce81fed8bc7e0f6b69e81445b9740
           SOURCE=$SPELLX-$VERSION.tar.xz
    SOURCE_URL[0]=$KDE_URL/stable/$VERSION/src/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
diff --git a/kde4/kdesdk4/HISTORY b/kde4/kdesdk4/HISTORY
index 3f6b474..7c3193e 100644
--- a/kde4/kdesdk4/HISTORY
+++ b/kde4/kdesdk4/HISTORY
@@ -1,3 +1,14 @@
+2012-07-29 Sukneet Basuta <sukneet AT sourcemage.org>
+       * DETAILS: updated spell to 4.8.4
+       * CONFIGURE: added query for umbrello
+       * DEPENDS: added depends strigi.
+         added depends libxslt, libxml2, & boost if umbrello enabled.
+         added optional_depends hunspell, qca2, antlr, kdebase4. Note that
+         : is replaced with @ in the flags since sorcery uses : as 
delimiters.
+         removed optional_depends db.
+       * BUILD: added, to add svn flags if SVN enabled/disabled.
+         replace @ with : in OPTS
+
 2012-05-08 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.8.3, bz2 -> xz