glib: Update from 2.50.3 to 2.52.1

This commit is contained in:
Fredrik Fornwall 2017-05-07 09:41:50 +02:00
parent f5d9b0d917
commit 6f4fab1181
2 changed files with 3 additions and 42 deletions

View File

@ -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"

View File

@ -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 were 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;