From 9698d551954e98b791bb7abd959ee14ab554b64a Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 7 May 2017 09:41:50 +0200
Subject: [PATCH] glib: Update from 2.50.3 to 2.52.1

---
 packages/glib/build.sh               |  6 +++---
 packages/glib/glib-gmessages.c.patch | 39 ------------------------------------
 2 files changed, 3 insertions(+), 42 deletions(-)
 delete mode 100644 packages/glib/glib-gmessages.c.patch

diff --git a/packages/glib/build.sh b/packages/glib/build.sh
index 9ecde6bc..f1a525f6 100755
--- 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_GLIB_MAJOR_VERSION=2.50
-TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.3
+_TERMUX_GLIB_MAJOR_VERSION=2.52
+TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.1
 TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${_TERMUX_GLIB_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999
+TERMUX_PKG_SHA256=948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f
 # libandroid-support to get langinfo.h in include path.
 TERMUX_PKG_DEPENDS="libffi, pcre, libandroid-support"
 TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc share/locale share/glib-2.0/gettext share/gdb/auto-load share/glib-2.0/codegen share/glib-2.0/gdb bin/gtester-report bin/glib-mkenums bin/glib-gettextize bin/gdbus-codegen"
diff --git a/packages/glib/glib-gmessages.c.patch b/packages/glib/glib-gmessages.c.patch
deleted file mode 100644
index 8c7d9e20..00000000
--- a/packages/glib/glib-gmessages.c.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -u -r ../glib-2.50.1/glib/gmessages.c ./glib/gmessages.c
---- ../glib-2.50.1/glib/gmessages.c	2016-10-10 09:39:07.000000000 -0400
-+++ ./glib/gmessages.c	2016-10-15 19:16:30.272794344 -0400
-@@ -1842,7 +1842,7 @@
-   return isatty (output_fd);
- }
- 
--#ifdef __linux__
-+#if defined(__linux__) && !defined(__ANDROID__)
- static int journal_fd = -1;
- 
- #ifndef SOCK_CLOEXEC
-@@ -1881,7 +1881,7 @@
- gboolean
- g_log_writer_is_journald (gint output_fd)
- {
--#ifdef __linux__
-+#if defined(__linux__) && !defined(__ANDROID__)
-   /* FIXME: Use the new journal API for detecting whether we’re writing to the
-    * journal. See: https://github.com/systemd/systemd/issues/2473
-    */
-@@ -2016,7 +2016,7 @@
-   return g_string_free (gstring, FALSE);
- }
- 
--#ifdef __linux__
-+#if defined(__linux__) && !defined(__ANDROID__)
- static int
- journal_sendv (struct iovec *iov,
-                gsize         iovlen)
-@@ -2130,7 +2130,7 @@
-                        gsize            n_fields,
-                        gpointer         user_data)
- {
--#ifdef __linux__
-+#if defined(__linux__) && !defined(__ANDROID__)
-   const char equals = '=';
-   const char newline = '\n';
-   gsize i, k;
-- 
2.11.0