OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 01-Nov-2008 11:11:12 Branch: HEAD Handle: 2008110110111101 Added files: openpkg-src/libidn libidn.patch Modified files: openpkg-src/libidn libidn.spec Log: upgrading package: libidn 1.10 -> 1.11 Summary: Revision Changes Path 1.5 +41 -0 openpkg-src/libidn/libidn.patch 1.58 +4 -8 openpkg-src/libidn/libidn.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/libidn/libidn.patch ============================================================================ $ cvs diff -u -r0 -r1.5 libidn.patch --- /dev/null 2008-11-01 11:11:06 +0100 +++ libidn.patch 2008-11-01 11:11:12 +0100 @@ -0,0 +1,41 @@ +Index: lib/gl/stdint.in.h +--- 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 +@@ -82,7 +82,7 @@ + # include <sys/inttypes.h> + #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 <sys/bitypes.h> that defines + int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is + included by <sys/types.h>. */ +@@ -437,8 +437,9 @@ + + + /* size_t limit */ +-#undef SIZE_MAX ++#ifndef SIZE_MAX + #define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, [EMAIL PROTECTED]@) ++#endif + + /* 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 + + ac_ext=c @@ . patch -p0 <<'@@ .' Index: openpkg-src/libidn/libidn.spec ============================================================================ $ cvs diff -u -r1.57 -r1.58 libidn.spec --- openpkg-src/libidn/libidn.spec 27 Aug 2008 15:22:20 -0000 1.57 +++ openpkg-src/libidn/libidn.spec 1 Nov 2008 10:11:12 -0000 1.58 @@ -31,11 +31,12 @@ Class: BASE Group: DNS License: LGPL -Version: 1.10 -Release: 20080827 +Version: 1.11 +Release: 20081101 # list of sources Source0: ftp://ftp.gnu.org/pub/gnu/libidn/libidn-%{version}.tar.gz +Patch0: libidn.patch # build information Prefix: %{l_prefix} @@ -74,9 +75,7 @@ %prep %setup -q - %{l_shtool} subst \ - -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \ - configure + %patch -p0 %{l_shtool} subst \ -e 's;^\(SUBDIRS = .*\) doc \(.*\)$;\1 \2;' \ Makefile.in @@ -84,9 +83,6 @@ -e 's;^\(Libs: -L${libdir} -lidn\)$;\1 @LTLIBICONV@;' \ libidn.pc.in %{l_shtool} subst \ - -e 's;^\(#if \)\(@[EMAIL PROTECTED])\( && ! defined __BIT_TYPES_DEFINED__.*\)$;\1(\2+0)\3;' \ - lib/gl/stdint_.h - %{l_shtool} subst \ -e 's;string.h $(WCHAR_H);string.h stdint.h $(WCHAR_H);' \ lib/gl/Makefile.in @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org