glib: Update from 2.44.1 to 2.46.2
authorFredrik Fornwall <fredrik@fornwall.net>
Sun, 8 Nov 2015 06:09:15 +0000 (01:09 -0500)
committerFredrik Fornwall <fredrik@fornwall.net>
Sun, 8 Nov 2015 06:09:15 +0000 (01:09 -0500)
packages/glib/build.sh
packages/glib/gthreadedresolver.c.patch [deleted file]

index a914b97..5829565 100755 (executable)
@@ -1,7 +1,7 @@
 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.44
-TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.1
+_TERMUX_GLIB_MAJOR_VERSION=2.46
+TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.2
 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/glib/${_TERMUX_GLIB_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="libffi, pcre"
 
diff --git a/packages/glib/gthreadedresolver.c.patch b/packages/glib/gthreadedresolver.c.patch
deleted file mode 100644 (file)
index ed7fe1c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../glib-2.42.1/gio/gthreadedresolver.c ./gio/gthreadedresolver.c
---- ../glib-2.42.1/gio/gthreadedresolver.c     2014-07-31 09:36:53.000000000 -0400
-+++ ./gio/gthreadedresolver.c  2014-12-21 14:20:34.755658537 -0500
-@@ -263,7 +263,7 @@
- #if defined(G_OS_UNIX)
--#ifdef __BIONIC__
-+#if defined __BIONIC__ && __ANDROID_API__ < 21
- /* Copy from bionic/libc/private/arpa_nameser_compat.h
-  * and bionic/libc/private/arpa_nameser.h */
- typedef struct {