image/wssplash.xpm \
ipmap.html \
macosx-setup.sh \
- macosx-support-lib-patches/glib-gconvert.patch \
macosx-support-lib-patches/glib-pkgconfig.patch \
macosx-support-lib-patches/gnutls-pkgconfig.patch \
make-version.pl \
# The following libraries are required.
#
GETTEXT_VERSION=0.18.1.1
-GLIB_VERSION=2.31.8
+GLIB_VERSION=2.31.20
#
# pkg-config 0.26 appears to have broken the "we have our own GLib"
# stuff, even if you explicitly set GLIB_CFLAGS and GLIB_LIBS.
# script doesn't try to use pkg-config to get the appropriate
# CFLAGS and LIBS.
#
-LIBFFI_CFLAGS="-I/usr/include/ffi" LIBFFI_LIBS="-L/usr/lib" ./configure || exit 1
-#
-# Mac OS X on 64-bit platforms provides libiconv, but in a form that
-# confuses GLib.
-#
-patch -p1 < ../../macosx-support-lib-patches/glib-gconvert.patch || exit 1
+LIBFFI_CFLAGS="-I/usr/include/ffi" LIBFFI_LIBS="-lffi" ./configure || exit 1
make -j 3 || exit 1
# Apply patch: we depend on libffi, but pkg-config doesn't get told.
patch -p0 <../../macosx-support-lib-patches/glib-pkgconfig.patch || exit 1
+++ /dev/null
---- glib-2.29.8/glib/gconvert.c.orig 2011-06-26 14:48:37.000000000 +0200
-+++ glib-2.29.8/glib/gconvert.c 2011-06-26 14:49:58.000000000 +0200
-@@ -61,7 +61,7 @@
- #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)
-+#if !(defined(__APPLE__) && defined(__LP64__)) && !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
- #error GNU libiconv not in use but included iconv.h is from libiconv
- #endif