Mercurial > mxe-octave

changeset 1254:2862397343ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix for glib on OS X: libiconv test applies to 32-bit versions also
author Tony Theodore <tonyt@logyst.com>
date Sun, 03 Oct 2010 05:07:05 +1100
parents 0a34a9e5c605
children 59a787bcec54
files src/glib-3-apple-iconv.patch src/glib-3-apple-lp64-iconv.patch
diffstat 2 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glib-3-apple-iconv.patch	Sun Oct 03 05:07:05 2010 +1100
@@ -0,0 +1,18 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch has been taken from:
+http://mail.gnome.org/archives/gtk-list/2009-August/msg00146.html
+
+diff -urN glib-2.25.17.orig/glib/gconvert.c glib-2.25.17/glib/gconvert.c
+--- glib-2.25.17.orig/glib/gconvert.c	2010-09-14 01:57:51.000000000 +1000
++++ glib-2.25.17/glib/gconvert.c	2010-09-27 22:51:58.000000000 +1000
+@@ -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(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !defined(__APPLE__)
+ #error GNU libiconv not in use but included iconv.h is from libiconv
+ #endif
+ 
--- a/src/glib-3-apple-lp64-iconv.patch	Sun Oct 03 04:57:29 2010 +1100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://mail.gnome.org/archives/gtk-list/2009-August/msg00146.html
-
-diff -urN glib-2.25.17.orig/glib/gconvert.c glib-2.25.17/glib/gconvert.c
---- glib-2.25.17.orig/glib/gconvert.c	2010-09-14 01:57:51.000000000 +1000
-+++ glib-2.25.17/glib/gconvert.c	2010-09-27 22:51:58.000000000 +1000
-@@ -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(USE_LIBICONV_GNU) && defined (_LIBICONV_H) && !(defined(__APPLE__) && defined(__LP64__))
- #error GNU libiconv not in use but included iconv.h is from libiconv
- #endif
-