Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 gnome2-libs/glib2/DEPENDS                |    2 +-
 gnome2-libs/glib2/DETAILS                |    8 ++++----
 gnome2-libs/glib2/HISTORY                |    5 +++++
 gnome2-libs/glib2/PRE_BUILD              |    6 ------
 gnome2-libs/glib2/patches/libiconv.patch |   12 ------------
 5 files changed, 10 insertions(+), 23 deletions(-)

New commits:
commit 6e32138b3242cc6829b35870cf4c9c9370417845
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    gnome2-libs/glib2: version 2.62.0

diff --git a/gnome2-libs/glib2/DEPENDS b/gnome2-libs/glib2/DEPENDS
index a2b326d..0ecef5a 100755
--- a/gnome2-libs/glib2/DEPENDS
+++ b/gnome2-libs/glib2/DEPENDS
@@ -10,7 +10,7 @@ depends xz-utils &&
 case "$HOST" in
 *-gnu) ;;
 *)
-  depends libiconv 'iconv=gnu'
+  depends libiconv 'iconv=external'
   ;;
 esac &&
 
diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index ea36c01..7cd3885 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,11 +1,11 @@
 . "${GRIMOIRE}/MESON_FUNCTIONS"
            SPELL=glib2
 if [[ $GLIB_VER == devel ]];then
-         VERSION=2.61.3
-     
SOURCE_HASH=sha256:ff434ba170976438f29243252b87a403499a908b3491bb66f21655887f7fc27a:UPSTREAM_HASH
+         VERSION=2.62.0
+     
SOURCE_HASH=sha256:6c257205a0a343b662c9961a58bb4ba1f1e31c82f5c6b909ec741194abc3da10:UPSTREAM_HASH
 else
-         VERSION=2.60.7
-     
SOURCE_HASH=sha256:8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310:UPSTREAM_HASH
+         VERSION=2.62.0
+     
SOURCE_HASH=sha256:6c257205a0a343b662c9961a58bb4ba1f1e31c82f5c6b909ec741194abc3da10:UPSTREAM_HASH
 fi
   SECURITY_PATCH=2
           SOURCE=glib-$VERSION.tar.xz
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 6a1eec6..ba0e42b 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,8 @@
+2019-09-09 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 2.62.0
+       * DEPENDS: updated libiconv flag
+       * PRE_BUILD, patches/libiconv.patch: dropped, fixed by upstream
+
 2019-09-06 Pavel Vinogradov <public AT sourcemage.org>
        * PRE_BUILD, patches/libiconv.patch: fixed libiconv test in stable
 
diff --git a/gnome2-libs/glib2/PRE_BUILD b/gnome2-libs/glib2/PRE_BUILD
deleted file mode 100755
index fb2a712..0000000
--- a/gnome2-libs/glib2/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-if [[ "${GLIB_VER}" == "stable" ]]; then
-  apply_patch_dir patches
-fi
diff --git a/gnome2-libs/glib2/patches/libiconv.patch 
b/gnome2-libs/glib2/patches/libiconv.patch
deleted file mode 100644
index 9f9bdd8..0000000
--- a/gnome2-libs/glib2/patches/libiconv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/meson.build b/meson.build
---- a/meson.build
-+++ b/meson.build
-@@ -1700,7 +1700,7 @@
-       found_iconv = true
-     endif
-   elif iconv_opt == 'gnu'
--    if cc.has_header_symbol('iconv.h', 'libiconv_open')
-+    if cc.has_header_symbol('iconv.h', 'iconv_open')
-       glib_conf.set('USE_LIBICONV_GNU', true)
-       libiconv = [cc.find_library('iconv')]
-       found_iconv = true