From ae454e04df431dc7f9219f6e586d58106c72d2d7 Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Sun, 3 Nov 2019 01:40:12 +0200
Subject: [PATCH] glib: update to 2.62.2

---
 packages/glib/build.sh              | 6 +++---
 packages/glib/gio-meson.build.patch | 8 --------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 packages/glib/gio-meson.build.patch

diff --git a/packages/glib/build.sh b/packages/glib/build.sh
index d6d90cdd2..a08daf476 100644
--- a/packages/glib/build.sh
+++ b/packages/glib/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/
 TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C"
 TERMUX_PKG_LICENSE="LGPL-2.1"
-TERMUX_PKG_VERSION=2.60.7
+TERMUX_PKG_VERSION=2.62.2
 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${TERMUX_PKG_VERSION:0:4}/glib-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=8b12c0af569afd3b71200556ad751bad4cf4bf7bc4b5f880638459a42ca86310
+TERMUX_PKG_SHA256=698824a413f76df039739c2a78f45b10939d526ae7495bab4e694e6730deb3f1
 # libandroid-support to get langinfo.h in include path.
 TERMUX_PKG_DEPENDS="libffi, libiconv, pcre, libandroid-support, zlib"
 TERMUX_PKG_BREAKS="glib-dev"
@@ -12,7 +12,7 @@ TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc lib/locale share/glib-2.0/gettext sha
 # Needed by pkg-config for glib-2.0:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dlibmount=false
--Diconv=gnu
+-Diconv=external
 "
 
 termux_step_pre_configure() {
diff --git a/packages/glib/gio-meson.build.patch b/packages/glib/gio-meson.build.patch
deleted file mode 100644
index ff98c7974..000000000
--- a/packages/glib/gio-meson.build.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -u -r ../glib-2.60.2/gio/meson.build ./gio/meson.build
---- ../glib-2.60.2/gio/meson.build	2019-05-03 13:43:28.000000000 +0000
-+++ ./gio/meson.build	2019-05-11 20:18:56.264103995 +0000
-@@ -994,4 +994,3 @@
- endif
- 
- subdir('fam')
--subdir('tests')