diff options
Diffstat (limited to 'macosx-support-lib-patches')
| -rw-r--r-- | macosx-support-lib-patches/glib-gconvert.patch | 10 | ||||
| -rw-r--r-- | macosx-support-lib-patches/glib-pkgconfig.patch | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/macosx-support-lib-patches/glib-gconvert.patch b/macosx-support-lib-patches/glib-gconvert.patch new file mode 100644 index 0000000000..fb0aea73b3 --- /dev/null +++ b/macosx-support-lib-patches/glib-gconvert.patch @@ -0,0 +1,10 @@ +--- 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 diff --git a/macosx-support-lib-patches/glib-pkgconfig.patch b/macosx-support-lib-patches/glib-pkgconfig.patch new file mode 100644 index 0000000000..37eb2a6862 --- /dev/null +++ b/macosx-support-lib-patches/glib-pkgconfig.patch @@ -0,0 +1,10 @@ +--- gobject-2.0.pc.orig 2011-06-26 16:07:00.000000000 +0200 ++++ gobject-2.0.pc 2011-06-26 16:07:11.000000000 +0200 +@@ -7,6 +7,6 @@ + Description: GLib Type, Object, Parameter and Signal Library + Requires: glib-2.0,gthread-2.0 + Version: 2.29.8 +-Libs: -L${libdir} -lgobject-2.0 ++Libs: -L${libdir} -lgobject-2.0 -lffi + Libs.private: -L/usr/lib + Cflags: |