contrib: patches for libiconv on WinCE

Yes, huge hacks inside. Submitted to upstream, we'll see what we can
clean up after they answer

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 66b2ed7f92b30e372a3141f82875efc7db174518..9907a99603d27ad8d2e2e3428b9ebb7b9d636222 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -423,6 +423,10 @@ libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
 ifdef HAVE_WIN64
        patch -p0 < Patches/libiconv-win64.patch
 endif
+ifdef HAVE_WINCE
+       patch -p0 < Patches/libiconv-wince.patch
+       patch -p0 < Patches/libiconv-wince-hack.patch
+endif
 
 libiconv-snowleopard.tar.bz2:
        $(WGET) $(LIBICONVMAC_URL)

diff --git a/extras/contrib/src/Patches/libiconv-wince-hack.patch b/extras/contrib/src/Patches/libiconv-wince-hack.patch
new file mode 100644 (file)
index 0000000..e3b39a5
--- /dev/null
+++ b/extras/contrib/src/Patches/libiconv-wince-hack.patch
@@ -0,0 +1,34 @@
+diff -urNp libiconv.orig/configure libiconv/configure
+--- libiconv.orig/configure    2009-06-30 22:51:53.000000000 +0200
++++ libiconv/configure 2009-11-12 04:41:02.000000000 +0100
+@@ -20344,6 +20344,7 @@ rm -f conftest*
+ 
+ 
+ fi
++gl_cv_header_signal_h_SIGPIPE=yes
+ { $as_echo "$as_me:$LINENO: result: $gl_cv_header_signal_h_SIGPIPE" >&5
+ $as_echo "$gl_cv_header_signal_h_SIGPIPE" >&6; }
+ 
+@@ -23459,7 +23460,6 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <signal.h>
+ /* Mingw defines sigset_t not in <signal.h>, but in <sys/types.h>.  */
+ #include <sys/types.h>
+ 
+diff -urNp libiconv.orig/signal.h libiconv/signal.h
+--- libiconv.orig/signal.h     1970-01-01 01:00:00.000000000 +0100
++++ libiconv/signal.h  2009-11-12 04:39:24.000000000 +0100
+@@ -0,0 +1,11 @@
++#ifndef       _SIGNAL_H_
++#define       _SIGNAL_H_
++
++#define       SIGABRT         22      /* Abnormal termination (abort) */
++
++typedef       void (*__p_sig_fn_t)(int);
++#define       SIG_DFL ((__p_sig_fn_t) 0)
++#define       SIG_IGN ((__p_sig_fn_t) 1)
++#define       SIG_ERR ((__p_sig_fn_t) -1)
++
++#endif        /* Not _SIGNAL_H_ */

diff --git a/extras/contrib/src/Patches/libiconv-wince.patch b/extras/contrib/src/Patches/libiconv-wince.patch
new file mode 100644 (file)
index 0000000..3dd3c60
--- /dev/null
+++ b/extras/contrib/src/Patches/libiconv-wince.patch
@@ -0,0 +1,14 @@
+diff -urNp libiconv.orig/src/iconv.c libiconv/src/iconv.c
+--- libiconv.orig/src/iconv.c  2009-06-21 13:17:33.000000000 +0200
++++ libiconv/src/iconv.c       2009-11-11 05:35:58.000000000 +0100
+@@ -26,7 +26,9 @@
+ #include <string.h>
+ #include <iconv.h>
+ #include <errno.h>
+-#include <locale.h>
++#ifdef HAVE_SETLOCALE
++# include <locale.h>
++#endif
+ #include <fcntl.h>
+ 
+ /* Ensure that iconv_no_i18n does not depend on libintl.  */