1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/libidn/libidn.patch Tue Aug 28 18:34:00 2012 +0200 1.3 @@ -0,0 +1,91 @@ 1.4 +Index: configure 1.5 +--- configure.orig 2012-05-23 10:36:44.000000000 +0200 1.6 ++++ configure 2012-05-29 09:37:30.000000000 +0200 1.7 +@@ -4984,10 +4984,7 @@ 1.8 + if $ac_preproc_ok; then : 1.9 + 1.10 + else 1.11 +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.12 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.13 +-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 1.14 +-See \`config.log' for more details" "$LINENO" 5; } 1.15 ++ : 1.16 + fi 1.17 + 1.18 + ac_ext=c 1.19 +Index: contrib/doxygen/Doxyfile 1.20 +Index: gl/error.c 1.21 +--- gl/error.c.orig 2012-04-27 10:18:42.000000000 +0200 1.22 ++++ gl/error.c 2012-05-29 09:37:03.000000000 +0200 1.23 +@@ -28,7 +28,7 @@ 1.24 + #include <stdlib.h> 1.25 + #include <string.h> 1.26 + 1.27 +-#if !_LIBC && ENABLE_NLS 1.28 ++#if !_LIBC && defined(ENABLE_NLS) 1.29 + # include "gettext.h" 1.30 + # define _(msgid) gettext (msgid) 1.31 + #endif 1.32 +Index: gl/gettext.h 1.33 +--- gl/gettext.h.orig 2012-04-27 10:18:42.000000000 +0200 1.34 ++++ gl/gettext.h 2012-05-29 09:37:03.000000000 +0200 1.35 +@@ -19,7 +19,7 @@ 1.36 + #define _LIBGETTEXT_H 1 1.37 + 1.38 + /* NLS can be disabled through the configure --disable-nls option. */ 1.39 +-#if ENABLE_NLS 1.40 ++#ifdef ENABLE_NLS 1.41 + 1.42 + /* Get declarations of GNU message catalog functions. */ 1.43 + # include <libintl.h> 1.44 +Index: lib/gl/gettext.h 1.45 +--- lib/gl/gettext.h.orig 2012-04-27 10:18:42.000000000 +0200 1.46 ++++ lib/gl/gettext.h 2012-05-29 09:37:03.000000000 +0200 1.47 +@@ -19,7 +19,7 @@ 1.48 + #define _LIBGETTEXT_H 1 1.49 + 1.50 + /* NLS can be disabled through the configure --disable-nls option. */ 1.51 +-#if ENABLE_NLS 1.52 ++#ifdef ENABLE_NLS 1.53 + 1.54 + /* Get declarations of GNU message catalog functions. */ 1.55 + # include <libintl.h> 1.56 +Index: lib/gl/stdint.in.h 1.57 +--- lib/gl/stdint.in.h.orig 2012-05-22 19:55:38.000000000 +0200 1.58 ++++ lib/gl/stdint.in.h 2012-05-29 09:37:03.000000000 +0200 1.59 +@@ -105,7 +105,7 @@ 1.60 + # include <sys/inttypes.h> 1.61 + #endif 1.62 + 1.63 +-#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ 1.64 ++#if (@HAVE_SYS_BITYPES_H@ + 0) && ! defined __BIT_TYPES_DEFINED__ 1.65 + /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines 1.66 + int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is 1.67 + included by <sys/types.h>. */ 1.68 +@@ -535,7 +535,7 @@ 1.69 + # define SIZE_MAX _STDINT_MAX (0, 32, 0ul) 1.70 + # endif 1.71 + #else 1.72 +-# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) 1.73 ++# define SIZE_MAX _STDINT_MAX (0, sizeof(size_t)*8, 0@SIZE_T_SUFFIX@) 1.74 + #endif 1.75 + 1.76 + /* wchar_t limits */ 1.77 +Index: lib/stringprep.c 1.78 +--- lib/stringprep.c.orig 2012-04-27 12:48:08.000000000 +0200 1.79 ++++ lib/stringprep.c 2012-05-29 09:37:03.000000000 +0200 1.80 +@@ -33,6 +33,14 @@ 1.81 + 1.82 + #include <stdlib.h> 1.83 + #include <string.h> 1.84 ++#include <limits.h> 1.85 ++ 1.86 ++#undef size_t 1.87 ++#if 0 1.88 ++#ifndef SIZE_MAX 1.89 ++#define SIZE_MAX ((((size_t)1)<<(sizeof(size_t)*8))-1) 1.90 ++#endif 1.91 ++#endif 1.92 + 1.93 + #include "stringprep.h" 1.94 +