From 2ad32bb3eeebe4b1a97d105c9c9b29e6f9e5d691 Mon Sep 17 00:00:00 2001
From: Sam Bingner <sam@bingner.com>
Date: Wed, 15 Aug 2018 12:49:34 -1000
Subject: Update glib to 2.57.2

---
 data/glib/_metadata/libffi.dep |   1 +
 data/glib/_metadata/pcre.dep   |   1 +
 data/glib/glib-2.20.4.tar.bz2  | Bin 5035410 -> 0 bytes
 data/glib/glib-2.57.2.tar.xz   | Bin 0 -> 4883340 bytes
 data/glib/libiconv.diff        |  17 -----------------
 data/glib/make.sh              |   3 ++-
 6 files changed, 4 insertions(+), 18 deletions(-)
 create mode 120000 data/glib/_metadata/libffi.dep
 create mode 120000 data/glib/_metadata/pcre.dep
 delete mode 100644 data/glib/glib-2.20.4.tar.bz2
 create mode 100644 data/glib/glib-2.57.2.tar.xz
 delete mode 100644 data/glib/libiconv.diff

diff --git a/data/glib/_metadata/libffi.dep b/data/glib/_metadata/libffi.dep
new file mode 120000
index 000000000..da9d6c358
--- /dev/null
+++ b/data/glib/_metadata/libffi.dep
@@ -0,0 +1 @@
+../../libffi
\ No newline at end of file
diff --git a/data/glib/_metadata/pcre.dep b/data/glib/_metadata/pcre.dep
new file mode 120000
index 000000000..f88da5e24
--- /dev/null
+++ b/data/glib/_metadata/pcre.dep
@@ -0,0 +1 @@
+../../pcre
\ No newline at end of file
diff --git a/data/glib/glib-2.20.4.tar.bz2 b/data/glib/glib-2.20.4.tar.bz2
deleted file mode 100644
index ccd58fdb7..000000000
Binary files a/data/glib/glib-2.20.4.tar.bz2 and /dev/null differ
diff --git a/data/glib/glib-2.57.2.tar.xz b/data/glib/glib-2.57.2.tar.xz
new file mode 100644
index 000000000..dd586e7b7
Binary files /dev/null and b/data/glib/glib-2.57.2.tar.xz differ
diff --git a/data/glib/libiconv.diff b/data/glib/libiconv.diff
deleted file mode 100644
index d299b3293..000000000
--- a/data/glib/libiconv.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ru glib-2.12.13/glib/gconvert.c glib-2.12.13+iPhone/glib/gconvert.c
---- glib-2.12.13/glib/gconvert.c	2007-07-16 18:57:12.000000000 +0000
-+++ glib-2.12.13+iPhone/glib/gconvert.c	2008-06-18 04:14:55.000000000 +0000
-@@ -41,13 +41,6 @@
- 
- #include "glibintl.h"
- 
--#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
--#error GNU libiconv in use but included iconv.h not from libiconv
--#endif
--#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
--#error GNU libiconv not in use but included iconv.h is from libiconv
--#endif
--
- #include "galias.h"
- 
- GQuark 
diff --git a/data/glib/make.sh b/data/glib/make.sh
index 3e4e753e7..966b3d22c 100644
--- a/data/glib/make.sh
+++ b/data/glib/make.sh
@@ -1,4 +1,5 @@
 pkg:setup
+NOCONFIGURE=1 ./autogen.sh
 pkg:configure glib_cv_stack_grows=no glib_cv_uscore=yes ac_cv_func_posix_getpwuid_r=yes ac_cv_func_posix_getgrgid_r=yes --with-libiconv=native
-make
+make -j8
 pkg:install
-- 
cgit v1.2.3