diff -uNr glib-2.22.2.orig/Makefile.in glib-2.22.2/Makefile.in --- glib-2.22.2.orig/Makefile.in 2009-10-07 22:56:32.000000000 +0900 +++ glib-2.22.2/Makefile.in 2009-12-04 16:49:38.283570620 +0900 @@ -41,9 +41,6 @@ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/README.in $(srcdir)/config.h.in \ $(srcdir)/config.h.win32.in \ - $(srcdir)/gio-2.0-uninstalled.pc.in $(srcdir)/gio-2.0.pc.in \ - $(srcdir)/gio-unix-2.0-uninstalled.pc.in \ - $(srcdir)/gio-unix-2.0.pc.in \ $(srcdir)/glib-2.0-uninstalled.pc.in $(srcdir)/glib-2.0.pc.in \ $(srcdir)/glib-gettextize.in $(srcdir)/glib-zip.in \ $(srcdir)/glibconfig.h.win32.in \ @@ -77,8 +74,8 @@ gmodule-2.0-uninstalled.pc \ gmodule-no-export-2.0-uninstalled.pc gthread-2.0.pc \ gthread-2.0-uninstalled.pc gobject-2.0.pc \ - gobject-2.0-uninstalled.pc gio-2.0.pc gio-unix-2.0.pc \ - gio-2.0-uninstalled.pc gio-unix-2.0-uninstalled.pc glib-zip \ + gobject-2.0-uninstalled.pc \ + glib-zip \ glib-gettextize INSTALL README config.h.win32 \ glibconfig.h.win32 CONFIG_CLEAN_VPATH_FILES = @@ -390,15 +387,15 @@ glibconfig.h.win32.in msvc_recommended_pragmas.h \ config.h.win32.in po/po2tbl.sed.in glib-2.0.pc.in \ gobject-2.0.pc.in gmodule-2.0.pc.in gmodule-export-2.0.pc.in \ - gmodule-no-export-2.0.pc.in gthread-2.0.pc.in gio-2.0.pc.in \ - gio-unix-2.0.pc.in glib-2.0-uninstalled.pc.in \ + gmodule-no-export-2.0.pc.in gthread-2.0.pc.in \ + glib-2.0-uninstalled.pc.in \ gobject-2.0-uninstalled.pc.in gmodule-2.0-uninstalled.pc.in \ gthread-2.0-uninstalled.pc.in \ - gmodule-no-export-2.0-uninstalled.pc.in \ - gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in + gmodule-no-export-2.0-uninstalled.pc.in + TEST_PROGS = AUTOMAKE_OPTIONS = 1.7 -SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs +SUBDIRS = . m4macros glib gmodule gthread gobject tests po docs DIST_SUBDIRS = $(SUBDIRS) build bin_SCRIPTS = glib-gettextize AM_CPPFLAGS = \ @@ -422,7 +419,7 @@ CONFIGURE_DEPENDENCIES = acglib.m4 BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc gio-2.0.pc gio-unix-2.0.pc +pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc # install mkinstalldirs for glib-gettextize's benefit gettextdir = $(datadir)/glib-2.0/gettext @@ -508,14 +505,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ gobject-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gobject-2.0-uninstalled.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ -gio-2.0.pc: $(top_builddir)/config.status $(srcdir)/gio-2.0.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -gio-unix-2.0.pc: $(top_builddir)/config.status $(srcdir)/gio-unix-2.0.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -gio-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gio-2.0-uninstalled.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -gio-unix-2.0-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/gio-unix-2.0-uninstalled.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ glib-zip: $(top_builddir)/config.status $(srcdir)/glib-zip.in cd $(top_builddir) && $(SHELL) ./config.status $@ glib-gettextize: $(top_builddir)/config.status $(srcdir)/glib-gettextize.in diff -uNr glib-2.22.2.orig/configure glib-2.22.2/configure --- glib-2.22.2.orig/configure 2009-10-07 22:56:34.000000000 +0900 +++ glib-2.22.2/configure 2009-12-04 16:50:18.832070560 +0900 @@ -45963,7 +45963,7 @@ ac_config_commands="$ac_config_commands glibconfig.h" -ac_config_files="$ac_config_files glib-2.0.pc glib-2.0-uninstalled.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gmodule-2.0-uninstalled.pc gmodule-no-export-2.0-uninstalled.pc gthread-2.0.pc gthread-2.0-uninstalled.pc gobject-2.0.pc gobject-2.0-uninstalled.pc gio-2.0.pc gio-unix-2.0.pc gio-2.0-uninstalled.pc gio-unix-2.0-uninstalled.pc glib-zip glib-gettextize Makefile build/Makefile build/win32/Makefile build/win32/dirent/Makefile build/win32/vs8/Makefile build/win32/vs9/Makefile glib/Makefile glib/libcharset/Makefile glib/gnulib/Makefile glib/pcre/Makefile glib/update-pcre/Makefile glib/tests/Makefile gmodule/Makefile gmodule/gmoduleconf.h gobject/Makefile gobject/glib-mkenums gobject/tests/Makefile gthread/Makefile gio/Makefile gio/xdgmime/Makefile gio/inotify/Makefile gio/libasyncns/Makefile gio/fen/Makefile gio/fam/Makefile gio/win32/Makefile gio/tests/Makefile po/Makefile.in docs/Makefile docs/reference/Makefile docs/reference/glib/Makefile docs/reference/glib/version.xml docs/reference/gobject/Makefile docs/reference/gobject/version.xml docs/reference/gio/Makefile docs/reference/gio/version.xml tests/Makefile tests/gobject/Makefile tests/refcount/Makefile m4macros/Makefile" +ac_config_files="$ac_config_files glib-2.0.pc glib-2.0-uninstalled.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gmodule-2.0-uninstalled.pc gmodule-no-export-2.0-uninstalled.pc gthread-2.0.pc gthread-2.0-uninstalled.pc gobject-2.0.pc gobject-2.0-uninstalled.pc glib-zip glib-gettextize Makefile build/Makefile build/win32/Makefile build/win32/dirent/Makefile build/win32/vs8/Makefile build/win32/vs9/Makefile glib/Makefile glib/libcharset/Makefile glib/gnulib/Makefile glib/pcre/Makefile glib/update-pcre/Makefile glib/tests/Makefile gmodule/Makefile gmodule/gmoduleconf.h gobject/Makefile gobject/glib-mkenums gobject/tests/Makefile gthread/Makefile po/Makefile.in docs/Makefile docs/reference/Makefile docs/reference/glib/Makefile docs/reference/glib/version.xml docs/reference/gobject/Makefile docs/reference/gobject/version.xml tests/Makefile tests/gobject/Makefile tests/refcount/Makefile m4macros/Makefile" ac_config_commands="$ac_config_commands chmod-scripts" @@ -47516,10 +47516,6 @@ "gthread-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gthread-2.0-uninstalled.pc" ;; "gobject-2.0.pc") CONFIG_FILES="$CONFIG_FILES gobject-2.0.pc" ;; "gobject-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gobject-2.0-uninstalled.pc" ;; - "gio-2.0.pc") CONFIG_FILES="$CONFIG_FILES gio-2.0.pc" ;; - "gio-unix-2.0.pc") CONFIG_FILES="$CONFIG_FILES gio-unix-2.0.pc" ;; - "gio-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gio-2.0-uninstalled.pc" ;; - "gio-unix-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gio-unix-2.0-uninstalled.pc" ;; "glib-zip") CONFIG_FILES="$CONFIG_FILES glib-zip" ;; "glib-gettextize") CONFIG_FILES="$CONFIG_FILES glib-gettextize" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; @@ -47540,14 +47536,6 @@ "gobject/glib-mkenums") CONFIG_FILES="$CONFIG_FILES gobject/glib-mkenums" ;; "gobject/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gobject/tests/Makefile" ;; "gthread/Makefile") CONFIG_FILES="$CONFIG_FILES gthread/Makefile" ;; - "gio/Makefile") CONFIG_FILES="$CONFIG_FILES gio/Makefile" ;; - "gio/xdgmime/Makefile") CONFIG_FILES="$CONFIG_FILES gio/xdgmime/Makefile" ;; - "gio/inotify/Makefile") CONFIG_FILES="$CONFIG_FILES gio/inotify/Makefile" ;; - "gio/libasyncns/Makefile") CONFIG_FILES="$CONFIG_FILES gio/libasyncns/Makefile" ;; - "gio/fen/Makefile") CONFIG_FILES="$CONFIG_FILES gio/fen/Makefile" ;; - "gio/fam/Makefile") CONFIG_FILES="$CONFIG_FILES gio/fam/Makefile" ;; - "gio/win32/Makefile") CONFIG_FILES="$CONFIG_FILES gio/win32/Makefile" ;; - "gio/tests/Makefile") CONFIG_FILES="$CONFIG_FILES gio/tests/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; @@ -47555,8 +47543,6 @@ "docs/reference/glib/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/glib/version.xml" ;; "docs/reference/gobject/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gobject/Makefile" ;; "docs/reference/gobject/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gobject/version.xml" ;; - "docs/reference/gio/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/gio/Makefile" ;; - "docs/reference/gio/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/gio/version.xml" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "tests/gobject/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gobject/Makefile" ;; "tests/refcount/Makefile") CONFIG_FILES="$CONFIG_FILES tests/refcount/Makefile" ;; diff -uNr glib-2.22.2.orig/docs/reference/Makefile.in glib-2.22.2/docs/reference/Makefile.in --- glib-2.22.2.orig/docs/reference/Makefile.in 2009-10-07 22:56:29.000000000 +0900 +++ glib-2.22.2/docs/reference/Makefile.in 2009-12-04 16:50:52.980070558 +0900 @@ -316,7 +316,7 @@ # initialize variables for unconditional += appending EXTRA_DIST = TEST_PROGS = -SUBDIRS = glib gobject gio +SUBDIRS = glib gobject all: all-recursive .SUFFIXES: diff -uNr glib-2.22.2.orig/glib/gconvert.c glib-2.22.2/glib/gconvert.c --- glib-2.22.2.orig/glib/gconvert.c 2009-08-28 12:51:21.000000000 +0900 +++ glib-2.22.2/glib/gconvert.c 2009-12-04 16:52:50.035570476 +0900 @@ -48,12 +48,17 @@ #include "glibintl.h" +/** + * Do not use error checking, building with iphone SDK + */ +#if 0 #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 +#endif #include "galias.h"