head 1.6; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.2.2.1 OPENPKG_E1_FP:1.2.2.1 OPENPKG_2_STABLE_MP:1.4 OPENPKG_2_STABLE_20061018:1.2.2.1 OPENPKG_2_STABLE_20060622:1.2 OPENPKG_2_STABLE:1.2.0.2 OPENPKG_2_STABLE_BP:1.2 OPENPKG_2_5_RELEASE:1.1 OPENPKG_2_5_SOLID:1.1.0.8 OPENPKG_2_5_SOLID_BP:1.1 OPENPKG_2_4_RELEASE:1.1 OPENPKG_2_4_SOLID:1.1.0.6 OPENPKG_2_4_SOLID_BP:1.1 OPENPKG_CW_FP:1.1 OPENPKG_2_3_RELEASE:1.1 OPENPKG_2_3_SOLID:1.1.0.4 OPENPKG_2_3_SOLID_BP:1.1 OPENPKG_2_2_RELEASE:1.1 OPENPKG_2_2_SOLID:1.1.0.2 OPENPKG_2_2_SOLID_BP:1.1; locks; strict; comment @# @; 1.6 date 2009.04.04.08.34.08; author rse; state Exp; branches; next 1.5; commitid zKYmfitYaeHaYFIt; 1.5 date 2008.11.01.10.11.11; author rse; state Exp; branches; next 1.4; commitid xbEtVyqRBnqnsTot; 1.4 date 2006.10.18.17.00.12; author cs; state dead; branches; next 1.3; commitid 2K5GusKNA3bpFbRr; 1.3 date 2006.08.27.09.14.30; author rse; state Exp; branches; next 1.2; commitid yqU460Xd8mzhLsKr; 1.2 date 2006.03.07.14.37.44; author rse; state Exp; branches 1.2.2.1; next 1.1; commitid vioOkDCdWm2W6gor; 1.1 date 2004.09.17.14.21.07; author rse; state Exp; branches; next ; 1.2.2.1 date 2006.10.16.14.51.56; author rse; state Exp; branches; next 1.2.2.2; commitid iZxwRSmmWscPXUQr; 1.2.2.2 date 2006.12.22.19.13.24; author thl; state dead; branches; next ; commitid 2LefOfqsS8nsjyZr; desc @@ 1.6 log @upgrading package: libidn 1.11 -> 1.14 @ text @Index: configure --- configure.orig 2009-04-03 14:28:28 +0200 +++ configure 2009-04-04 09:25:40 +0200 @@@@ -4944,10 +4944,7 @@@@ if $ac_preproc_ok; then : else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } + : fi ac_ext=c Index: gl/error.c --- gl/error.c.orig 2009-04-03 14:13:43 +0200 +++ gl/error.c 2009-04-04 09:25:40 +0200 @@@@ -28,7 +28,7 @@@@ #include #include -#if !_LIBC && ENABLE_NLS +#if !_LIBC && defined(ENABLE_NLS) # include "gettext.h" # define _(msgid) gettext (msgid) #endif Index: gl/gettext.h --- gl/gettext.h.orig 2009-04-03 14:13:43 +0200 +++ gl/gettext.h 2009-04-04 09:25:40 +0200 @@@@ -19,7 +19,7 @@@@ #define _LIBGETTEXT_H 1 /* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS +#ifdef ENABLE_NLS /* Get declarations of GNU message catalog functions. */ # include Index: lib/gl/gettext.h --- lib/gl/gettext.h.orig 2009-04-03 14:13:43 +0200 +++ lib/gl/gettext.h 2009-04-04 09:54:12 +0200 @@@@ -19,7 +19,7 @@@@ #define _LIBGETTEXT_H 1 /* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS +#ifdef ENABLE_NLS /* Get declarations of GNU message catalog functions. */ # include Index: lib/gl/stdint.in.h --- lib/gl/stdint.in.h.orig 2009-04-03 14:13:43 +0200 +++ lib/gl/stdint.in.h 2009-04-04 10:28:44 +0200 @@@@ -82,7 +82,7 @@@@ # include #endif -#if @@HAVE_SYS_BITYPES_H@@ && ! defined __BIT_TYPES_DEFINED__ +#if (@@HAVE_SYS_BITYPES_H@@ + 0) && ! defined __BIT_TYPES_DEFINED__ /* Linux libc4 >= 4.6.7 and libc5 have a that defines int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is included by . */ @@@@ -469,7 +469,7 @@@@ # define SIZE_MAX _STDINT_MAX (0, 32, 0ul) # endif #else -# define SIZE_MAX _STDINT_MAX (0, @@BITSIZEOF_SIZE_T@@, 0@@SIZE_T_SUFFIX@@) +# define SIZE_MAX _STDINT_MAX (0, sizeof(size_t)*8, 0@@SIZE_T_SUFFIX@@) #endif /* wchar_t limits */ Index: lib/stringprep.c --- lib/stringprep.c.orig 2009-04-03 14:13:43 +0200 +++ lib/stringprep.c 2009-04-04 10:00:25 +0200 @@@@ -25,6 +25,14 @@@@ #include #include +#include + +#undef size_t +#if 0 +#ifndef SIZE_MAX +#define SIZE_MAX ((((size_t)1)<<(sizeof(size_t)*8))-1) +#endif +#endif #include "stringprep.h" @ 1.5 log @upgrading package: libidn 1.10 -> 1.11 @ text @d1 51 d53 2 a54 2 --- lib/gl/stdint.in.h.orig 2008-10-22 11:16:31 +0200 +++ lib/gl/stdint.in.h 2008-11-01 11:04:53 +0100 d64 7 a70 1 @@@@ -437,8 +437,9 @@@@ d72 5 d78 6 a83 2 /* size_t limit */ -#undef SIZE_MAX d85 2 a86 1 #define SIZE_MAX _STDINT_MAX (0, @@BITSIZEOF_SIZE_T@@, 0@@SIZE_T_SUFFIX@@) d89 1 a89 18 /* wchar_t limits */ #undef WCHAR_MIN Index: configure --- configure.orig 2008-10-28 19:05:45 +0100 +++ configure 2008-11-01 11:08:40 +0100 @@@@ -4591,13 +4591,7 @@@@ if $ac_preproc_ok; then : else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } + : fi a90 1 ac_ext=c @ 1.4 log @upgrading package: libidn 0.6.7 -> 0.6.8 @ text @d1 4 a4 26 Index: libidn.pc.in --- libidn.pc.in.orig 2005-05-26 16:39:47 +0200 +++ libidn.pc.in 2006-03-07 15:33:05 +0100 @@@@ -17,5 +17,5 @@@@ Name: Libidn Description: IETF stringprep, nameprep, punycode, IDNA text processing. Version: @@VERSION@@ -Libs: -L${libdir} -lidn +Libs: -L${libdir} -lidn @@LTLIBICONV@@ Cflags: -I${includedir} Index: Makefile.in --- Makefile.in.orig 2006-02-07 09:54:29 +0100 +++ Makefile.in 2006-03-07 15:34:22 +0100 @@@@ -260,7 +260,7 @@@@ sharedstatedir = @@sharedstatedir@@ sysconfdir = @@sysconfdir@@ target_alias = @@target_alias@@ -SUBDIRS = gl lib po src doc tests examples java csharp +SUBDIRS = gl lib po src tests examples java csharp ACLOCAL_AMFLAGS = -I m4 -I gl/m4 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc EXTRA_DIST = FAQ libc/README libc/getaddrinfo-idn.txt libc/example.c \ Index: gl/stdint_.h --- gl/stdint_.h.orig 2006-08-09 23:06:45 +0200 +++ gl/stdint_.h 2006-08-27 11:11:20 +0200 @@@@ -69,7 +69,7 @@@@ d9 1 a9 1 +#if (@@HAVE_SYS_BITYPES_H@@+0) && ! defined __BIT_TYPES_DEFINED__ d13 29 @ 1.3 log @upgrading package: libidn 0.6.5 -> 0.6.6 @ text @@ 1.2 log @fix building and cleanup packaging @ text @d23 12 @ 1.2.2.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a22 12 Index: gl/stdint_.h --- gl/stdint_.h.orig 2006-08-09 23:06:45 +0200 +++ gl/stdint_.h 2006-08-27 11:11:20 +0200 @@@@ -69,7 +69,7 @@@@ # include #endif -#if @@HAVE_SYS_BITYPES_H@@ && ! defined __BIT_TYPES_DEFINED__ +#if (@@HAVE_SYS_BITYPES_H@@+0) && ! defined __BIT_TYPES_DEFINED__ /* Linux libc4 >= 4.6.7 and libc5 have a that defines int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is included by . */ @ 1.2.2.2 log @MFC: make up leeway for 2_STABLE by virtue of build-time results @ text @@ 1.1 log @requires libiconv; make sure it detects it; make sure it announces it forward to other packages @ text @d2 2 a3 2 --- libidn.pc.in.orig 2004-04-18 22:37:53 +0200 +++ libidn.pc.in 2004-09-17 16:18:09 +0200 d11 12 @