From 69fd9a5c109837236d088efbc297a04816ac06f0 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 15 Oct 2016 20:02:32 -0400
Subject: [PATCH] glib: Update from 2.48.2 to 2.50.1

---
 packages/glib/build.sh               |  8 ++++----
 packages/glib/glib-gmessages.c.patch | 39 ++++++++++++++++++++++++++++++++++++
 packages/glib/glib-gtimezone.c.patch |  4 +++-
 3 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 packages/glib/glib-gmessages.c.patch

diff --git a/packages/glib/build.sh b/packages/glib/build.sh
index da9f32f5..b4e449f5 100755
--- a/packages/glib/build.sh
+++ b/packages/glib/build.sh
@@ -1,9 +1,8 @@
 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.48
-TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.2
-TERMUX_PKG_BUILD_REVISION=2
-TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/glib/${_TERMUX_GLIB_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz
+_TERMUX_GLIB_MAJOR_VERSION=2.50
+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_DEPENDS="libffi, pcre"
 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"
 # Needed by pkg-config for glib-2.0:
@@ -15,6 +14,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-compile-warnings --disable-gtk-doc --
 # --disable-znodelete to avoid DF_1_NODELETE which most Android 5.0 linkers does not support:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-znodelete"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-libelf"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-libmount"
 
 termux_step_pre_configure () {
 	# glib checks for __BIONIC__ instead of __ANDROID__:
diff --git a/packages/glib/glib-gmessages.c.patch b/packages/glib/glib-gmessages.c.patch
new file mode 100644
index 00000000..8c7d9e20
--- /dev/null
+++ b/packages/glib/glib-gmessages.c.patch
@@ -0,0 +1,39 @@
+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;
diff --git a/packages/glib/glib-gtimezone.c.patch b/packages/glib/glib-gtimezone.c.patch
index 886298d5..450d0dd0 100644
--- a/packages/glib/glib-gtimezone.c.patch
+++ b/packages/glib/glib-gtimezone.c.patch
@@ -1,3 +1,5 @@
+Patch submitted at https://bugzilla.gnome.org/show_bug.cgi?id=771304
+
 diff -u -r ../glib-2.48.2/glib/gtimezone.c ./glib/gtimezone.c
 --- ../glib-2.48.2/glib/gtimezone.c	2016-08-17 12:07:29.000000000 -0400
 +++ ./glib/gtimezone.c	2016-09-12 16:52:41.864974630 -0400
@@ -33,8 +35,8 @@ diff -u -r ../glib-2.48.2/glib/gtimezone.c ./glib/gtimezone.c
 +    uint32_t offset, length, unused;
 +  } __attribute__((packed)) entry;
 +
++  char sys_timezone[PROP_VALUE_MAX];
 +  if (identifier == NULL) {
-+    char sys_timezone[PROP_VALUE_MAX];
 +    if (__system_property_get("persist.sys.timezone", sys_timezone) < 1) {
 +      g_warning("__system_property_get(\"persist.sys.timezone\") failed\n");
 +      return NULL;
-- 
2.11.0