Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 gnome2-libs/glibmm/BUILD           |    7 -------
 gnome2-libs/glibmm/CONFIGURE       |    2 +-
 gnome2-libs/glibmm/DEPENDS         |    6 +++++-
 gnome2-libs/glibmm/DETAILS         |    1 +
 gnome2-libs/glibmm/HISTORY         |    7 +++++++
 gnome2-libs/glibmm/PRE_SUB_DEPENDS |   10 +++++++---
 gnome2-libs/glibmm/SUB_DEPENDS     |   13 ++++++++-----
 7 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit d66b335807126c56e1c13676012b706e0875f71b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    glibmm: Add optional dependency on doxygen, PATCHLEVEL++
    
    Also, remove FULLDOCS, as the optional dependency is enough.

diff --git a/gnome2-libs/glibmm/BUILD b/gnome2-libs/glibmm/BUILD
deleted file mode 100755
index 820fcc9..0000000
--- a/gnome2-libs/glibmm/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-if [[ $FULLDOCS == y ]]; then
-   OPTS="$OPTS build-documentation=true"
-else
-   OPTS="$OPTS build-documentation=false"
-fi &&
-
-default_build
diff --git a/gnome2-libs/glibmm/CONFIGURE b/gnome2-libs/glibmm/CONFIGURE
index 9a767aa..b5f98a8 100755
--- a/gnome2-libs/glibmm/CONFIGURE
+++ b/gnome2-libs/glibmm/CONFIGURE
@@ -1,3 +1,3 @@
 . "${GRIMOIRE}/MESON_CONFIGURE" &&
 
-config_query FULLDOCS "Generate fully-documented reference docs?" n
+persistent_remove FULLDOCS
diff --git a/gnome2-libs/glibmm/DEPENDS b/gnome2-libs/glibmm/DEPENDS
index 90031fb..fe9b8d3 100755
--- a/gnome2-libs/glibmm/DEPENDS
+++ b/gnome2-libs/glibmm/DEPENDS
@@ -1,3 +1,7 @@
 depends meson        &&
 depends libsigc++3.0 &&
-depends glib2
+depends glib2 &&
+
+optional_depends doxygen \
+                build-documentation={true,false} \
+                'for building the documentation'
diff --git a/gnome2-libs/glibmm/DETAILS b/gnome2-libs/glibmm/DETAILS
index 337cd79..afc09d9 100755
--- a/gnome2-libs/glibmm/DETAILS
+++ b/gnome2-libs/glibmm/DETAILS
@@ -1,6 +1,7 @@
 . "${GRIMOIRE}/MESON_FUNCTIONS"
            SPELL=glibmm
          VERSION=2.68.0
+      PATCHLEVEL=1
      
SOURCE_HASH=sha512:a13121052315e949acf2528e226079f1a2cf7853080aec770dcb269e422997e5515ed767c7a549231fb3fa5f913b3fd9ef083080589283824b6a218d066b253e
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
diff --git a/gnome2-libs/glibmm/HISTORY b/gnome2-libs/glibmm/HISTORY
index a18ebc7..a166220 100644
--- a/gnome2-libs/glibmm/HISTORY
+++ b/gnome2-libs/glibmm/HISTORY
@@ -1,3 +1,10 @@
+2020-12-30 Ismael Luceno <ismael AT iodev.co.uk>
+       * DEPENDS: Added optional dependency on doxygen
+       * CONFIGURE: Removed FULLDOCS
+       * PRE_SUB_DEPENDS, SUB_DEPENDS: FULLDOCS -> doxygen
+       * BUILD: Removed, no longer needed
+       * DETAILS: PATCHLEVEL++
+
 2020-12-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.68.0
        * DEPENDS, CONFIGURE, DETAILS: use meson
diff --git a/gnome2-libs/glibmm/PRE_SUB_DEPENDS 
b/gnome2-libs/glibmm/PRE_SUB_DEPENDS
index 131aea8..a3c40de 100755
--- a/gnome2-libs/glibmm/PRE_SUB_DEPENDS
+++ b/gnome2-libs/glibmm/PRE_SUB_DEPENDS
@@ -1,5 +1,9 @@
 case $THIS_SUB_DEPENDS in
-  DOC) if [[ $FULLDOCS == "y" ]]; then return 0; fi ;;
-    *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
-  return 1;;
+  DOC)
+    is_depends_enabled "$SPELL" doxygen
+    ;;
+  *)
+    message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+    false
+    ;;
 esac
diff --git a/gnome2-libs/glibmm/SUB_DEPENDS b/gnome2-libs/glibmm/SUB_DEPENDS
index 5c3689d..3939af6 100755
--- a/gnome2-libs/glibmm/SUB_DEPENDS
+++ b/gnome2-libs/glibmm/SUB_DEPENDS
@@ -1,7 +1,10 @@
-persistent_add FULLDOCS
 case $THIS_SUB_DEPENDS in
-    DOC) message "Documentation requested, forcing build" &&
-         FULLDOCS="y";;
-      *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
-    return 1;;
+  DOC)
+    message "Documentation requested, forcing doxygen dependency." &&
+    depends doxygen
+    ;;
+  *)
+    message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
+    false
+    ;;
 esac