From 3810c1887edcfd4ee77e4998e916963f0686c441 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 19 May 2010 01:27:07 +0200 Subject: Update after gnulib changed. --- ChangeLog | 23 ++++++++++++++++++ autogen.sh | 24 +++++++++---------- gnulib-local/Makefile.am | 18 +++++++------- gnulib-local/lib/unicase.h.diff | 19 --------------- gnulib-local/lib/unicase.in.h.diff | 19 +++++++++++++++ gnulib-local/lib/uniconv.h.diff | 28 ---------------------- gnulib-local/lib/uniconv.in.h.diff | 28 ++++++++++++++++++++++ gnulib-local/lib/unictype.h.diff | 24 ------------------- gnulib-local/lib/unictype.in.h.diff | 24 +++++++++++++++++++ gnulib-local/lib/unilbrk.h.diff | 19 --------------- gnulib-local/lib/unilbrk.in.h.diff | 19 +++++++++++++++ gnulib-local/lib/uninorm.h.diff | 14 ----------- gnulib-local/lib/uninorm.in.h.diff | 14 +++++++++++ gnulib-local/lib/unistr.h.diff | 28 ---------------------- gnulib-local/lib/unistr.in.h.diff | 28 ++++++++++++++++++++++ gnulib-local/lib/unitypes.h.diff | 19 --------------- gnulib-local/lib/unitypes.in.h.diff | 19 +++++++++++++++ gnulib-local/lib/uniwidth.h.diff | 19 --------------- gnulib-local/lib/uniwidth.in.h.diff | 19 +++++++++++++++ .../modules/unictype/category-none-tests.diff | 2 +- gnulib-m4/.gitignore | 1 + lib/.gitignore | 22 ++++++++--------- 22 files changed, 227 insertions(+), 203 deletions(-) delete mode 100644 gnulib-local/lib/unicase.h.diff create mode 100644 gnulib-local/lib/unicase.in.h.diff delete mode 100644 gnulib-local/lib/uniconv.h.diff create mode 100644 gnulib-local/lib/uniconv.in.h.diff delete mode 100644 gnulib-local/lib/unictype.h.diff create mode 100644 gnulib-local/lib/unictype.in.h.diff delete mode 100644 gnulib-local/lib/unilbrk.h.diff create mode 100644 gnulib-local/lib/unilbrk.in.h.diff delete mode 100644 gnulib-local/lib/uninorm.h.diff create mode 100644 gnulib-local/lib/uninorm.in.h.diff delete mode 100644 gnulib-local/lib/unistr.h.diff create mode 100644 gnulib-local/lib/unistr.in.h.diff delete mode 100644 gnulib-local/lib/unitypes.h.diff create mode 100644 gnulib-local/lib/unitypes.in.h.diff delete mode 100644 gnulib-local/lib/uniwidth.h.diff create mode 100644 gnulib-local/lib/uniwidth.in.h.diff diff --git a/ChangeLog b/ChangeLog index 63e01fb..73742af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,26 @@ +2010-05-16 Bruno Haible + + Update after gnulib changed. + * gnulib-local/lib/unicase.in.h.diff: Renamed from + gnulib-local/lib/unicase.h.diff. + * gnulib-local/lib/uniconv.in.h.diff: Renamed from + gnulib-local/lib/uniconv.h.diff. + * gnulib-local/lib/unictype.in.h.diff: Renamed from + gnulib-local/lib/unictype.h.diff. + * gnulib-local/lib/unilbrk.in.h.diff: Renamed from + gnulib-local/lib/unilbrk.h.diff. + * gnulib-local/lib/uninorm.in.h.diff: Renamed from + gnulib-local/lib/uninorm.h.diff. + * gnulib-local/lib/unistr.in.h.diff: Renamed from + gnulib-local/lib/unistr.h.diff. + * gnulib-local/lib/unitypes.in.h.diff: Renamed from + gnulib-local/lib/unitypes.h.diff. + * gnulib-local/lib/uniwidth.in.h.diff: Renamed from + gnulib-local/lib/uniwidth.h.diff. + * gnulib-local/Makefile.am (EXTRA_DIST): Update. + * gnulib-local/modules/unictype/category-none-tests.diff: Update. + * autogen.sh: Update. + 2010-05-14 Bruno Haible Publicize also the subminor version number. diff --git a/autogen.sh b/autogen.sh index e062b33..dc40850 100755 --- a/autogen.sh +++ b/autogen.sh @@ -420,23 +420,23 @@ if test $skip_gnulib = false; then # Change lib/unistr.h to be usable standalone. sed -e 's/ifdef GNULIB_[A-Za-z0-9_]*/if 1/' -e 's/defined GNULIB_[A-Za-z0-9_]*/1/g' \ -e 's/HAVE_INLINE/UNISTRING_HAVE_INLINE/g' \ - < lib/unistr.h \ - > lib/unistr.h.tmp \ - && mv lib/unistr.h.tmp lib/unistr.h + < lib/unistr.in.h \ + > lib/unistr.in.h.tmp \ + && mv lib/unistr.in.h.tmp lib/unistr.in.h # Change lib/unictype.h and lib/uninorm.h for shared libraries on Woe32 systems. sed -e 's/extern const uc_general_category_t UC_/extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_/' \ -e 's/extern const uc_property_t UC_/extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_/' \ - < lib/unictype.h \ - > lib/unictype.h.tmp \ - && mv lib/unictype.h.tmp lib/unictype.h + < lib/unictype.in.h \ + > lib/unictype.in.h.tmp \ + && mv lib/unictype.in.h.tmp lib/unictype.in.h sed -e 's/extern const struct unicode_normalization_form /extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form /' \ - < lib/uninorm.h \ - > lib/uninorm.h.tmp \ - && mv lib/uninorm.h.tmp lib/uninorm.h + < lib/uninorm.in.h \ + > lib/uninorm.in.h.tmp \ + && mv lib/uninorm.in.h.tmp lib/uninorm.in.h sed -e 's/extern const casing_/extern LIBUNISTRING_DLL_VARIABLE const casing_/' \ - < lib/unicase.h \ - > lib/unicase.h.tmp \ - && mv lib/unicase.h.tmp lib/unicase.h + < lib/unicase.in.h \ + > lib/unicase.in.h.tmp \ + && mv lib/unicase.in.h.tmp lib/unicase.in.h $GNULIB_TOOL --copy-file build-aux/config.guess; chmod a+x build-aux/config.guess $GNULIB_TOOL --copy-file build-aux/config.sub; chmod a+x build-aux/config.sub # If we got no texinfo.tex so far, take the snapshot from gnulib. diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am index c415913..d011b8d 100644 --- a/gnulib-local/Makefile.am +++ b/gnulib-local/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the gnulib-local directory of GNU libunistring -## Copyright (C) 2006-2009 Free Software Foundation, Inc. +## Copyright (C) 2006-2010 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -19,12 +19,12 @@ # Generate this list with # find . '(' -name Makefile.am ')' -prune -o -type f '!' '(' -name '*.orig' -or -name '*~' ')' -printf '%P\n' | sort | tr '\012' @ | sed 's/@$/%/;s/@/ \\@/g' | tr @% '\012\012' EXTRA_DIST = \ -lib/unicase.h.diff \ -lib/uniconv.h.diff \ -lib/unictype.h.diff \ -lib/unilbrk.h.diff \ -lib/uninorm.h.diff \ -lib/unistr.h.diff \ -lib/unitypes.h.diff \ -lib/uniwidth.h.diff \ +lib/unicase.in.h.diff \ +lib/uniconv.in.h.diff \ +lib/unictype.in.h.diff \ +lib/unilbrk.in.h.diff \ +lib/uninorm.in.h.diff \ +lib/unistr.in.h.diff \ +lib/unitypes.in.h.diff \ +lib/uniwidth.in.h.diff \ modules/unictype/category-none-tests.diff diff --git a/gnulib-local/lib/unicase.h.diff b/gnulib-local/lib/unicase.h.diff deleted file mode 100644 index 1381770..0000000 --- a/gnulib-local/lib/unicase.h.diff +++ /dev/null @@ -1,19 +0,0 @@ -*** unicase.h.orig 2009-04-05 19:30:26.000000000 +0200 ---- unicase.h 2009-04-10 16:21:23.000000000 +0200 -*************** -*** 20,26 **** - #include "unitypes.h" - - /* Get bool. */ -! #include - - /* Get size_t. */ - #include ---- 20,26 ---- - #include "unitypes.h" - - /* Get bool. */ -! #include - - /* Get size_t. */ - #include diff --git a/gnulib-local/lib/unicase.in.h.diff b/gnulib-local/lib/unicase.in.h.diff new file mode 100644 index 0000000..6fa4261 --- /dev/null +++ b/gnulib-local/lib/unicase.in.h.diff @@ -0,0 +1,19 @@ +*** unicase.in.h.orig 2009-04-05 19:30:26.000000000 +0200 +--- unicase.in.h 2009-04-10 16:21:23.000000000 +0200 +*************** +*** 20,26 **** + #include "unitypes.h" + + /* Get bool. */ +! #include + + /* Get size_t. */ + #include +--- 20,26 ---- + #include "unitypes.h" + + /* Get bool. */ +! #include + + /* Get size_t. */ + #include diff --git a/gnulib-local/lib/uniconv.h.diff b/gnulib-local/lib/uniconv.h.diff deleted file mode 100644 index d640323..0000000 --- a/gnulib-local/lib/uniconv.h.diff +++ /dev/null @@ -1,28 +0,0 @@ -*** uniconv.h.orig 2009-04-10 23:40:31.000000000 +0200 ---- uniconv.h 2009-04-10 23:41:19.000000000 +0200 -*************** -*** 23,35 **** - #include "unitypes.h" - - /* Get enum iconv_ilseq_handler. */ -! #include "iconveh.h" -! -! /* Get uniconv_register_autodetect() declaration. */ -! #include "striconveha.h" - - /* Get locale_charset() declaration. */ -! #include "localcharset.h" - - - #ifdef __cplusplus ---- 23,32 ---- - #include "unitypes.h" - - /* Get enum iconv_ilseq_handler. */ -! #include - - /* Get locale_charset() declaration. */ -! #include - - - #ifdef __cplusplus diff --git a/gnulib-local/lib/uniconv.in.h.diff b/gnulib-local/lib/uniconv.in.h.diff new file mode 100644 index 0000000..341caba --- /dev/null +++ b/gnulib-local/lib/uniconv.in.h.diff @@ -0,0 +1,28 @@ +*** uniconv.in.h.orig 2009-04-10 23:40:31.000000000 +0200 +--- uniconv.in.h 2009-04-10 23:41:19.000000000 +0200 +*************** +*** 23,35 **** + #include "unitypes.h" + + /* Get enum iconv_ilseq_handler. */ +! #include "iconveh.h" +! +! /* Get uniconv_register_autodetect() declaration. */ +! #include "striconveha.h" + + /* Get locale_charset() declaration. */ +! #include "localcharset.h" + + + #ifdef __cplusplus +--- 23,32 ---- + #include "unitypes.h" + + /* Get enum iconv_ilseq_handler. */ +! #include + + /* Get locale_charset() declaration. */ +! #include + + + #ifdef __cplusplus diff --git a/gnulib-local/lib/unictype.h.diff b/gnulib-local/lib/unictype.h.diff deleted file mode 100644 index 14347bc..0000000 --- a/gnulib-local/lib/unictype.h.diff +++ /dev/null @@ -1,24 +0,0 @@ -*** unictype.h.orig 2009-04-05 12:15:57.000000000 +0200 ---- unictype.h 2009-04-12 04:31:36.000000000 +0200 -*************** -*** 19,26 **** - - #include "unitypes.h" - - /* Get bool. */ -! #include - - /* Get size_t. */ - #include ---- 19,29 ---- - - #include "unitypes.h" - -+ /* Get LIBUNISTRING_DLL_VARIABLE. */ -+ #include -+ - /* Get bool. */ -! #include - - /* Get size_t. */ - #include diff --git a/gnulib-local/lib/unictype.in.h.diff b/gnulib-local/lib/unictype.in.h.diff new file mode 100644 index 0000000..cb68885 --- /dev/null +++ b/gnulib-local/lib/unictype.in.h.diff @@ -0,0 +1,24 @@ +*** unictype.in.h.orig 2009-04-05 12:15:57.000000000 +0200 +--- unictype.in.h 2009-04-12 04:31:36.000000000 +0200 +*************** +*** 19,26 **** + + #include "unitypes.h" + + /* Get bool. */ +! #include + + /* Get size_t. */ + #include +--- 19,29 ---- + + #include "unitypes.h" + ++ /* Get LIBUNISTRING_DLL_VARIABLE. */ ++ #include ++ + /* Get bool. */ +! #include + + /* Get size_t. */ + #include diff --git a/gnulib-local/lib/unilbrk.h.diff b/gnulib-local/lib/unilbrk.h.diff deleted file mode 100644 index a5b86c3..0000000 --- a/gnulib-local/lib/unilbrk.h.diff +++ /dev/null @@ -1,19 +0,0 @@ -*** unilbrk.h.orig 2008-05-10 14:46:17.000000000 +0200 ---- unilbrk.h 2009-04-10 22:39:40.000000000 +0200 -*************** -*** 24,30 **** - #include "unitypes.h" - - /* Get locale_charset() declaration. */ -! #include "localcharset.h" - - - #ifdef __cplusplus ---- 24,30 ---- - #include "unitypes.h" - - /* Get locale_charset() declaration. */ -! #include - - - #ifdef __cplusplus diff --git a/gnulib-local/lib/unilbrk.in.h.diff b/gnulib-local/lib/unilbrk.in.h.diff new file mode 100644 index 0000000..9731c8e --- /dev/null +++ b/gnulib-local/lib/unilbrk.in.h.diff @@ -0,0 +1,19 @@ +*** unilbrk.in.h.orig 2008-05-10 14:46:17.000000000 +0200 +--- unilbrk.in.h 2009-04-10 22:39:40.000000000 +0200 +*************** +*** 24,30 **** + #include "unitypes.h" + + /* Get locale_charset() declaration. */ +! #include "localcharset.h" + + + #ifdef __cplusplus +--- 24,30 ---- + #include "unitypes.h" + + /* Get locale_charset() declaration. */ +! #include + + + #ifdef __cplusplus diff --git a/gnulib-local/lib/uninorm.h.diff b/gnulib-local/lib/uninorm.h.diff deleted file mode 100644 index 89d8995..0000000 --- a/gnulib-local/lib/uninorm.h.diff +++ /dev/null @@ -1,14 +0,0 @@ -*** uninorm.h.orig 2009-04-05 12:38:24.000000000 +0200 ---- uninorm.h 2009-04-12 04:31:52.000000000 +0200 -*************** -*** 18,23 **** ---- 18,26 ---- - #ifndef _UNINORM_H - #define _UNINORM_H - -+ /* Get LIBUNISTRING_DLL_VARIABLE. */ -+ #include -+ - /* Get size_t. */ - #include - diff --git a/gnulib-local/lib/uninorm.in.h.diff b/gnulib-local/lib/uninorm.in.h.diff new file mode 100644 index 0000000..47f644e --- /dev/null +++ b/gnulib-local/lib/uninorm.in.h.diff @@ -0,0 +1,14 @@ +*** uninorm.in.h.orig 2009-04-05 12:38:24.000000000 +0200 +--- uninorm.in.h 2009-04-12 04:31:52.000000000 +0200 +*************** +*** 18,23 **** +--- 18,26 ---- + #ifndef _UNINORM_H + #define _UNINORM_H + ++ /* Get LIBUNISTRING_DLL_VARIABLE. */ ++ #include ++ + /* Get size_t. */ + #include + diff --git a/gnulib-local/lib/unistr.h.diff b/gnulib-local/lib/unistr.h.diff deleted file mode 100644 index 3e59093..0000000 --- a/gnulib-local/lib/unistr.h.diff +++ /dev/null @@ -1,28 +0,0 @@ -*** unistr.h.orig 2009-12-24 23:21:27.000000000 +0100 ---- unistr.h 2009-12-25 02:04:40.000000000 +0100 -*************** -*** 20,29 **** - #include "unitypes.h" - - /* Get common macros for C. */ -! #include "unused-parameter.h" - - /* Get bool. */ -! #include - - /* Get size_t. */ - #include ---- 20,32 ---- - #include "unitypes.h" - - /* Get common macros for C. */ -! #include -! -! /* Get inline if available. */ -! #include - - /* Get bool. */ -! #include - - /* Get size_t. */ - #include diff --git a/gnulib-local/lib/unistr.in.h.diff b/gnulib-local/lib/unistr.in.h.diff new file mode 100644 index 0000000..0b31c86 --- /dev/null +++ b/gnulib-local/lib/unistr.in.h.diff @@ -0,0 +1,28 @@ +*** unistr.in.h.orig 2009-12-24 23:21:27.000000000 +0100 +--- unistr.in.h 2009-12-25 02:04:40.000000000 +0100 +*************** +*** 20,29 **** + #include "unitypes.h" + + /* Get common macros for C. */ +! #include "unused-parameter.h" + + /* Get bool. */ +! #include + + /* Get size_t. */ + #include +--- 20,32 ---- + #include "unitypes.h" + + /* Get common macros for C. */ +! #include +! +! /* Get inline if available. */ +! #include + + /* Get bool. */ +! #include + + /* Get size_t. */ + #include diff --git a/gnulib-local/lib/unitypes.h.diff b/gnulib-local/lib/unitypes.h.diff deleted file mode 100644 index 39597ff..0000000 --- a/gnulib-local/lib/unitypes.h.diff +++ /dev/null @@ -1,19 +0,0 @@ -*** unitypes.h.orig 2009-04-05 19:30:36.000000000 +0200 ---- unitypes.h 2009-04-10 16:22:07.000000000 +0200 -*************** -*** 18,24 **** - #define _UNITYPES_H - - /* Get uint8_t, uint16_t, uint32_t. */ -! #include - - /* Type representing a Unicode character. */ - typedef uint32_t ucs4_t; ---- 18,24 ---- - #define _UNITYPES_H - - /* Get uint8_t, uint16_t, uint32_t. */ -! #include - - /* Type representing a Unicode character. */ - typedef uint32_t ucs4_t; diff --git a/gnulib-local/lib/unitypes.in.h.diff b/gnulib-local/lib/unitypes.in.h.diff new file mode 100644 index 0000000..f490695 --- /dev/null +++ b/gnulib-local/lib/unitypes.in.h.diff @@ -0,0 +1,19 @@ +*** unitypes.in.h.orig 2009-04-05 19:30:36.000000000 +0200 +--- unitypes.in.h 2009-04-10 16:22:07.000000000 +0200 +*************** +*** 18,24 **** + #define _UNITYPES_H + + /* Get uint8_t, uint16_t, uint32_t. */ +! #include + + /* Type representing a Unicode character. */ + typedef uint32_t ucs4_t; +--- 18,24 ---- + #define _UNITYPES_H + + /* Get uint8_t, uint16_t, uint32_t. */ +! #include + + /* Type representing a Unicode character. */ + typedef uint32_t ucs4_t; diff --git a/gnulib-local/lib/uniwidth.h.diff b/gnulib-local/lib/uniwidth.h.diff deleted file mode 100644 index 7448d4c..0000000 --- a/gnulib-local/lib/uniwidth.h.diff +++ /dev/null @@ -1,19 +0,0 @@ -*** uniwidth.h.orig 2007-10-07 17:24:38.000000000 +0200 ---- uniwidth.h 2009-04-10 22:39:46.000000000 +0200 -*************** -*** 23,29 **** - #include - - /* Get locale_charset() declaration. */ -! #include "localcharset.h" - - #ifdef __cplusplus - extern "C" { ---- 23,29 ---- - #include - - /* Get locale_charset() declaration. */ -! #include - - #ifdef __cplusplus - extern "C" { diff --git a/gnulib-local/lib/uniwidth.in.h.diff b/gnulib-local/lib/uniwidth.in.h.diff new file mode 100644 index 0000000..ded6c81 --- /dev/null +++ b/gnulib-local/lib/uniwidth.in.h.diff @@ -0,0 +1,19 @@ +*** uniwidth.in.h.orig 2007-10-07 17:24:38.000000000 +0200 +--- uniwidth.in.h 2009-04-10 22:39:46.000000000 +0200 +*************** +*** 23,29 **** + #include + + /* Get locale_charset() declaration. */ +! #include "localcharset.h" + + #ifdef __cplusplus + extern "C" { +--- 23,29 ---- + #include + + /* Get locale_charset() declaration. */ +! #include + + #ifdef __cplusplus + extern "C" { diff --git a/gnulib-local/modules/unictype/category-none-tests.diff b/gnulib-local/modules/unictype/category-none-tests.diff index 4e8b507..c9705ed 100644 --- a/gnulib-local/modules/unictype/category-none-tests.diff +++ b/gnulib-local/modules/unictype/category-none-tests.diff @@ -10,5 +10,5 @@ TESTS += test-categ_none check_PROGRAMS += test-categ_none test_categ_none_SOURCES = unictype/test-categ_none.c + test_categ_none_LDADD = $(LDADD) $(LIBUNISTRING) + endif - diff --git a/gnulib-m4/.gitignore b/gnulib-m4/.gitignore index 29197a4..960b265 100644 --- a/gnulib-m4/.gitignore +++ b/gnulib-m4/.gitignore @@ -44,6 +44,7 @@ /lib-ld.m4 /lib-link.m4 /lib-prefix.m4 +/libunistring-base.m4 /localcharset.m4 /locale-fr.m4 /locale-ja.m4 diff --git a/lib/.gitignore b/lib/.gitignore index 75d8146..7dfff22 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -84,18 +84,18 @@ /striconveha.h /string.in.h /strncat.c -/unicase.h -/uniconv.h -/unictype.h -/unilbrk.h -/uniname.h -/uninorm.h +/unicase.in.h +/uniconv.in.h +/unictype.in.h +/unilbrk.in.h +/uniname.in.h +/uninorm.in.h /unistd.in.h -/unistdio.h -/unistr.h -/unitypes.h -/uniwbrk.h -/uniwidth.h +/unistdio.in.h +/unistr.in.h +/unitypes.in.h +/uniwbrk.in.h +/uniwidth.in.h /vasnprintf.c /verify.h /wchar.in.h -- cgit v1.2.1