Update libiconv patches for upstream 1.14 release.

4 files changed, 109 insertions, 23 deletions

diff --git a/sdk/recipes/patches/libiconv/libcharset.lib.localcharset.c.p b/sdk/recipes/patches/libiconv/libcharset.lib.localcharset.c.p
index 0764907..b456c94 100644
--- a/sdk/recipes/patches/libiconv/libcharset.lib.localcharset.c.p
+++ b/sdk/recipes/patches/libiconv/libcharset.lib.localcharset.c.p
@@ -1,6 +1,6 @@
 --- libcharset/lib/localcharset.c.old	2010-12-29 19:12:21.000000000 +0000
 +++ libcharset/lib/localcharset.c	2010-12-29 19:12:49.000000000 +0000
-@@ -319,9 +319,6 @@
+@@ -352,9 +352,6 @@
     If the canonical name cannot be determined, the result is a non-canonical
     name.  */
  
diff --git a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p
index a55b06e..93ee6a9 100644
--- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p
+++ b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p
@@ -1,29 +1,72 @@
---- srclib/signal.in.h.old	2012-10-21 01:08:10.000000000 +0100
-+++ srclib/signal.in.h	2012-10-21 01:10:19.000000000 +0100
-@@ -76,26 +76,6 @@
- /* This code supports only 32 signals.  */
- typedef int verify_NSIG_constraint[2 * (NSIG <= 32) - 1];
+--- srclib/signal.in.h.orig	2011-08-07 14:42:06.000000000 +0100
++++ srclib/signal.in.h	2014-01-15 00:57:27.620548058 +0000
+@@ -168,69 +168,6 @@
+ 
+ # endif
  
--/* A set or mask of signals.  */
--# if !@HAVE_SIGSET_T@
--typedef unsigned int sigset_t;
--# endif
--
 -/* Test whether a given signal is contained in a signal set.  */
--extern int sigismember (const sigset_t *set, int sig);
+-# if @HAVE_POSIX_SIGNALBLOCKING@
+-/* This function is defined as a macro on MacOS X.  */
+-#  if defined __cplusplus && defined GNULIB_NAMESPACE
+-#   undef sigismember
+-#  endif
+-# else
+-_GL_FUNCDECL_SYS (sigismember, int, (const sigset_t *set, int sig)
+-                                    _GL_ARG_NONNULL ((1)));
+-# endif
+-_GL_CXXALIAS_SYS (sigismember, int, (const sigset_t *set, int sig));
+-_GL_CXXALIASWARN (sigismember);
 -
 -/* Initialize a signal set to the empty set.  */
--extern int sigemptyset (sigset_t *set);
+-# if @HAVE_POSIX_SIGNALBLOCKING@
+-/* This function is defined as a macro on MacOS X.  */
+-#  if defined __cplusplus && defined GNULIB_NAMESPACE
+-#   undef sigemptyset
+-#  endif
+-# else
+-_GL_FUNCDECL_SYS (sigemptyset, int, (sigset_t *set) _GL_ARG_NONNULL ((1)));
+-# endif
+-_GL_CXXALIAS_SYS (sigemptyset, int, (sigset_t *set));
+-_GL_CXXALIASWARN (sigemptyset);
 -
 -/* Add a signal to a signal set.  */
--extern int sigaddset (sigset_t *set, int sig);
+-# if @HAVE_POSIX_SIGNALBLOCKING@
+-/* This function is defined as a macro on MacOS X.  */
+-#  if defined __cplusplus && defined GNULIB_NAMESPACE
+-#   undef sigaddset
+-#  endif
+-# else
+-_GL_FUNCDECL_SYS (sigaddset, int, (sigset_t *set, int sig)
+-                                  _GL_ARG_NONNULL ((1)));
+-# endif
+-_GL_CXXALIAS_SYS (sigaddset, int, (sigset_t *set, int sig));
+-_GL_CXXALIASWARN (sigaddset);
 -
 -/* Remove a signal from a signal set.  */
--extern int sigdelset (sigset_t *set, int sig);
+-# if @HAVE_POSIX_SIGNALBLOCKING@
+-/* This function is defined as a macro on MacOS X.  */
+-#  if defined __cplusplus && defined GNULIB_NAMESPACE
+-#   undef sigdelset
+-#  endif
+-# else
+-_GL_FUNCDECL_SYS (sigdelset, int, (sigset_t *set, int sig)
+-                                  _GL_ARG_NONNULL ((1)));
+-# endif
+-_GL_CXXALIAS_SYS (sigdelset, int, (sigset_t *set, int sig));
+-_GL_CXXALIASWARN (sigdelset);
 -
 -/* Fill a signal set with all possible signals.  */
--extern int sigfillset (sigset_t *set);
+-# if @HAVE_POSIX_SIGNALBLOCKING@
+-/* This function is defined as a macro on MacOS X.  */
+-#  if defined __cplusplus && defined GNULIB_NAMESPACE
+-#   undef sigfillset
+-#  endif
+-# else
+-_GL_FUNCDECL_SYS (sigfillset, int, (sigset_t *set) _GL_ARG_NONNULL ((1)));
+-# endif
+-_GL_CXXALIAS_SYS (sigfillset, int, (sigset_t *set));
+-_GL_CXXALIASWARN (sigfillset);
 -
  /* Return the set of those blocked signals that are pending.  */
- extern int sigpending (sigset_t *set);
- 
+ # if !@HAVE_POSIX_SIGNALBLOCKING@
+ _GL_FUNCDECL_SYS (sigpending, int, (sigset_t *set) _GL_ARG_NONNULL ((1)));
diff --git a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.sigprocmask.c.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.sigprocmask.c.p
index 16c4410..a811881 100644
--- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.sigprocmask.c.p
+++ b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.sigprocmask.c.p
@@ -1,5 +1,5 @@
---- srclib/sigprocmask.c.old	2012-10-21 01:14:40.000000000 +0100
-+++ srclib/sigprocmask.c	2012-10-21 01:15:24.000000000 +0100
+--- srclib/sigprocmask.c.orig	2011-08-07 14:42:06.000000000 +0100
++++ srclib/sigprocmask.c	2014-01-15 00:59:33.130968152 +0000
 @@ -83,77 +83,6 @@
  # define signal ext_signal
  #endif
@@ -11,7 +11,7 @@
 -    {
 -      #ifdef SIGABRT_COMPAT
 -      if (sig == SIGABRT_COMPAT)
--	sig = SIGABRT;
+-        sig = SIGABRT;
 -      #endif
 -
 -      return (*set >> sig) & 1;
@@ -34,7 +34,7 @@
 -    {
 -      #ifdef SIGABRT_COMPAT
 -      if (sig == SIGABRT_COMPAT)
--	sig = SIGABRT;
+-        sig = SIGABRT;
 -      #endif
 -
 -      *set |= 1U << sig;
@@ -54,7 +54,7 @@
 -    {
 -      #ifdef SIGABRT_COMPAT
 -      if (sig == SIGABRT_COMPAT)
--	sig = SIGABRT;
+-        sig = SIGABRT;
 -      #endif
 -
 -      *set &= ~(1U << sig);
diff --git a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.unistd.in.h.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.unistd.in.h.p
new file mode 100644
index 0000000..eecac92
--- /dev/null
+++ b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.unistd.in.h.p
@@ -0,0 +1,43 @@
+--- srclib/unistd.in.h.orig	2014-01-15 01:06:20.525844246 +0000
++++ srclib/unistd.in.h	2014-01-15 01:06:48.717471325 +0000
+@@ -1145,40 +1145,6 @@
+ #endif
+ 
+ 
+-#if @GNULIB_READLINK@
+-/* Read the contents of the symbolic link FILE and place the first BUFSIZE
+-   bytes of it into BUF.  Return the number of bytes placed into BUF if
+-   successful, otherwise -1 and errno set.
+-   See the POSIX:2001 specification
+-   <http://www.opengroup.org/susv3xsh/readlink.html>.  */
+-# if @REPLACE_READLINK@
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   define readlink rpl_readlink
+-#  endif
+-_GL_FUNCDECL_RPL (readlink, ssize_t,
+-                  (const char *file, char *buf, size_t bufsize)
+-                  _GL_ARG_NONNULL ((1, 2)));
+-_GL_CXXALIAS_RPL (readlink, ssize_t,
+-                  (const char *file, char *buf, size_t bufsize));
+-# else
+-#  if !@HAVE_READLINK@
+-_GL_FUNCDECL_SYS (readlink, ssize_t,
+-                  (const char *file, char *buf, size_t bufsize)
+-                  _GL_ARG_NONNULL ((1, 2)));
+-#  endif
+-_GL_CXXALIAS_SYS (readlink, ssize_t,
+-                  (const char *file, char *buf, size_t bufsize));
+-# endif
+-_GL_CXXALIASWARN (readlink);
+-#elif defined GNULIB_POSIXCHECK
+-# undef readlink
+-# if HAVE_RAW_DECL_READLINK
+-_GL_WARN_ON_USE (readlink, "readlink is unportable - "
+-                 "use gnulib module readlink for portability");
+-# endif
+-#endif
+-
+-
+ #if @GNULIB_READLINKAT@
+ # if !@HAVE_READLINKAT@
+ _GL_FUNCDECL_SYS (readlinkat, ssize_t,