wireshark/macosx-support-lib-patches/glib-gconvert.c.patch

--- glib/gconvert.c.dist	2008-09-12 10:55:51.000000000 -0700
+++ glib/gconvert.c	2013-07-08 17:23:57.000000000 -0700
@@ -52,7 +52,9 @@
 #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
+  #if !defined (__APPLE_CC__) && !defined (__LP_64__)
+    #error GNU libiconv not in use but included iconv.h is from libiconv
+  #endif
 #endif
 
 #include "galias.h"
Use older versions of some libraries, and build 32-bit, when building for Leopard. Fix some issues that came up with the older versions. We don't support building on Leopard - we check for that up front - so eliminate some code to handle that. When uninstalling, check for the installed version by looking at the name of the -done file, so we don't have to trust the _VERSION settings. We don't appear to need to build our own versions of libpng or pixman when building on Snow Leopard for Leopard. The libffi configure patch for GLib appears not to be necessary - perhaps building and installing pkg-config before building GLib makes it no longer necessary - and it doesn't work with older versions of GLib, so don't apply it. svn path=/trunk/; revision=50456 2013-07-09 04:41:34 +00:00			`--- glib/gconvert.c.dist 2008-09-12 10:55:51.000000000 -0700`
			`+++ glib/gconvert.c 2013-07-08 17:23:57.000000000 -0700`
			`@@ -52,7 +52,9 @@`
			`#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`
			`+ #if !defined (__APPLE_CC__) && !defined (__LP_64__)`
			`+ #error GNU libiconv not in use but included iconv.h is from libiconv`
			`+ #endif`
			`#endif`

			`#include "galias.h"`