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/glib-networking/DEPENDS |    3 ++-
 gnome2-libs/glib-networking/HISTORY |    3 +++
 gnome2-libs/glib2/DETAILS           |    9 ++-------
 gnome2-libs/glib2/HISTORY           |    5 +++++
 gnome2-libs/glib2/PREPARE           |    1 -
 gnome2-libs/glib2/PRE_SUB_DEPENDS   |    2 +-
 gnome2-libs/glib2/SUB_DEPENDS       |    2 --
 7 files changed, 13 insertions(+), 12 deletions(-)

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

    glib-networking: Request matching version of glib2

commit 80798396954f9069a0ef254be6b2cf3a42880b7b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    glib2 2.64.1

commit 6e62b2642cac3cf63d220c9c6b88d02194bc444e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    glib2: Remove GLIB_VER and GLIB_DEVEL

diff --git a/gnome2-libs/glib-networking/DEPENDS 
b/gnome2-libs/glib-networking/DEPENDS
index a358fa1..3a39411 100755
--- a/gnome2-libs/glib-networking/DEPENDS
+++ b/gnome2-libs/glib-networking/DEPENDS
@@ -4,7 +4,8 @@ depends meson &&
 
 depends glib2 &&
 
-if spell_ok glib2 && is_version_less $(installed_version glib2) 2.32; then
+# XXX Released in tandem with glib, so request the same
+if spell_ok glib2 && is_version_less $(installed_version glib2) 
${VERSION%.*}; then
   force_depends glib2
 fi &&
 
diff --git a/gnome2-libs/glib-networking/HISTORY 
b/gnome2-libs/glib-networking/HISTORY
index ff9b782..ce25a12 100644
--- a/gnome2-libs/glib-networking/HISTORY
+++ b/gnome2-libs/glib-networking/HISTORY
@@ -1,3 +1,6 @@
+2020-04-03 Ismael Luceno <ismael AT sourcemage.org>
+       * DEPENDS: request matching version of glib2
+
 2020-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.64.1
 
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index 331e053..ba0fb56 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,12 +1,7 @@
 . "${GRIMOIRE}/MESON_FUNCTIONS"
            SPELL=glib2
-if [[ $GLIB_VER == devel ]];then
-         VERSION=2.63.6
-     
SOURCE_HASH=sha256:f78e5d77b5a5dd6ffd24b18a611b4daf1b312c2a81151e56f2c54377ed4f3f64:UPSTREAM_HASH
-else
-         VERSION=2.62.4
-     
SOURCE_HASH=sha256:4c84030d77fa9712135dfa8036ad663925655ae95b1d19399b6200e869925bbc:UPSTREAM_HASH
-fi
+         VERSION=2.64.1
+     
SOURCE_HASH=sha512:1cefe49a42233f24ac6bd09c134ceea7119f4f74f42204a731be56100a180eec69c8224674f0b08d1538ad0859896ed08260a6af0fed469c7d10b4508116a6bc
   SECURITY_PATCH=2
           SOURCE=glib-$VERSION.tar.xz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/glib-$VERSION"
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 0dc51b4..c284030 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,8 @@
+2020-04-03 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS, PRE_SUB_DEPENDS, SUB_DEPENDS: removed GLIB_VER and 
GLIB_DEVEL
+       * PREPARE: removed, no longer needed
+       * DETAILS: updated to 2.64.1
+
 2020-02-26 Treeve Jelbert <treeve AT sourcemage.org>
        * DEPENDS: fix libmount flags
 
diff --git a/gnome2-libs/glib2/PREPARE b/gnome2-libs/glib2/PREPARE
deleted file mode 100755
index 2f9b37c..0000000
--- a/gnome2-libs/glib2/PREPARE
+++ /dev/null
@@ -1 +0,0 @@
-config_query_list GLIB_VER 'which version to build?' stable devel
diff --git a/gnome2-libs/glib2/PRE_SUB_DEPENDS 
b/gnome2-libs/glib2/PRE_SUB_DEPENDS
index c555d64..ebf2f40 100755
--- a/gnome2-libs/glib2/PRE_SUB_DEPENDS
+++ b/gnome2-libs/glib2/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
 case $THIS_SUB_DEPENDS in
-   GLIB_DEVEL) if [[ "$GLIB_VER" == "devel" ]]; then return 0; fi;;
+   GLIB_DEVEL) ;;
    PYTHON) if is_depends_enabled $SPELL python; then return 0;
            elif is_depends_enabled $SPELL python3; then return 0;
            fi ;;
diff --git a/gnome2-libs/glib2/SUB_DEPENDS b/gnome2-libs/glib2/SUB_DEPENDS
index 0ae7f3d..a543af4 100755
--- a/gnome2-libs/glib2/SUB_DEPENDS
+++ b/gnome2-libs/glib2/SUB_DEPENDS
@@ -1,6 +1,4 @@
 case $THIS_SUB_DEPENDS in
-   GLIB_DEVEL) echo "Devel release needed, forcing it."  &&
-             GLIB_VER="devel"                          ;;
    PYTHON) depends PYTHON ;;
    *)        echo "unknown sub-depends!"; return 1         ;;
 esac