From d3983072bc481df2803c12944f2eca6f7aa79809 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 18 Aug 2009 18:14:09 +0100 Subject: Add gettext 0.17 (from OE.dev) Signed-off-by: Richard Purdie --- meta/packages/gettext/gettext-0.17/autotools.patch | 62 ++++++++++++++ .../gettext-error_print_progname.patch | 13 +++ .../gettext/gettext-0.17/use_open_properly.patch | 15 ++++ .../gettext/gettext-0.17/wchar-uclibc.patch | 96 ++++++++++++++++++++++ 4 files changed, 186 insertions(+) create mode 100644 meta/packages/gettext/gettext-0.17/autotools.patch create mode 100644 meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch create mode 100644 meta/packages/gettext/gettext-0.17/use_open_properly.patch create mode 100644 meta/packages/gettext/gettext-0.17/wchar-uclibc.patch (limited to 'meta/packages/gettext/gettext-0.17') diff --git a/meta/packages/gettext/gettext-0.17/autotools.patch b/meta/packages/gettext/gettext-0.17/autotools.patch new file mode 100644 index 000000000..9f16b1881 --- /dev/null +++ b/meta/packages/gettext/gettext-0.17/autotools.patch @@ -0,0 +1,62 @@ +Index: gettext-0.17/gettext-runtime/man/Makefile.am +=================================================================== +--- gettext-0.17.orig/gettext-runtime/man/Makefile.am 2007-10-07 21:37:36.000000000 +0200 ++++ gettext-0.17/gettext-runtime/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200 +@@ -158,8 +158,7 @@ + $(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@ + mv t-$@ $@ + +-install-html-local: +- $(mkdir_p) $(DESTDIR)$(htmldir) ++install-html: installdirs-html + for file in $(man_HTML); do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \ +Index: gettext-0.17/gettext-tools/man/Makefile.am +=================================================================== +--- gettext-0.17.orig/gettext-tools/man/Makefile.am 2007-10-28 00:18:37.000000000 +0200 ++++ gettext-0.17/gettext-tools/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200 +@@ -186,8 +186,7 @@ + $(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@ + mv t-$@ $@ + +-install-html-local: +- $(mkdir_p) $(DESTDIR)$(htmldir) ++install-html: installdirs-html + for file in $(man_HTML); do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \ +Index: gettext-0.17/gettext-runtime/libasprintf/configure.ac +=================================================================== +--- gettext-0.17.orig/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:42.000000000 +0200 ++++ gettext-0.17/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:54.000000000 +0200 +@@ -1,5 +1,5 @@ + dnl Configuration for the GNU libasprintf library +-dnl Copyright (C) 2002-2006 Free Software Foundation, Inc. ++dnl Copyright (C) 2002-2007 Free Software Foundation, Inc. + dnl + dnl This program is free software: you can redistribute it and/or modify + dnl it under the terms of the GNU General Public License as published by +@@ -54,8 +54,7 @@ + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_INLINE + AC_TYPE_SIZE_T +-gl_AC_TYPE_LONG_LONG +-gt_TYPE_LONGDOUBLE ++AC_TYPE_LONG_LONG_INT + gt_TYPE_WCHAR_T + gt_TYPE_WINT_T + AC_CHECK_TYPE([ptrdiff_t], , +@@ -79,8 +78,11 @@ + AC_SUBST([ALLOCA_H]) + + AC_CHECK_FUNCS([snprintf vasprintf wcslen]) +-AC_CHECK_DECLS([_snprintf]) ++dnl Use the _snprintf function only if it is declared (because on NetBSD it ++dnl is defined as a weak alias of snprintf; we prefer to use the latter). ++AC_CHECK_DECLS([_snprintf], , , [#include ]) + gt_PRINTF_POSIX ++gl_EOVERFLOW + + dnl Check for tools needed for formatting the documentation. + ac_aux_dir_abs=`cd $ac_aux_dir && pwd` diff --git a/meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch b/meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch new file mode 100644 index 000000000..0f67cd0b2 --- /dev/null +++ b/meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch @@ -0,0 +1,13 @@ +Index: gettext-0.17/gettext-tools/libgettextpo/error.h +=================================================================== +--- gettext-0.17.orig/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:25.561115527 +0200 ++++ gettext-0.17/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:52.454440505 +0200 +@@ -49,7 +49,7 @@ + /* If NULL, error will flush stdout, then print on stderr the program + name, a colon and a space. Otherwise, error will call this + function without parameters instead. */ +-extern DLL_VARIABLE void (*error_print_progname) (void); ++void (*error_print_progname) (void); + + /* This variable is incremented each time `error' is called. */ + extern DLL_VARIABLE unsigned int error_message_count; diff --git a/meta/packages/gettext/gettext-0.17/use_open_properly.patch b/meta/packages/gettext/gettext-0.17/use_open_properly.patch new file mode 100644 index 000000000..111714b54 --- /dev/null +++ b/meta/packages/gettext/gettext-0.17/use_open_properly.patch @@ -0,0 +1,15 @@ +Index: gettext-0.17/gettext-tools/src/write-catalog.c +=================================================================== +--- gettext-0.17.orig/gettext-tools/src/write-catalog.c 2008-10-16 15:18:16.000000000 +0200 ++++ gettext-0.17/gettext-tools/src/write-catalog.c 2008-10-16 18:17:13.000000000 +0200 +@@ -220,7 +220,9 @@ + /* Open the output file. */ + if (!to_stdout) + { +- fd = open (filename, O_WRONLY | O_CREAT); ++ fd = open (filename, O_WRONLY | O_CREAT, ++ /* 0666 in portable POSIX notation: */ ++ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); + if (fd < 0) + { + const char *errno_description = strerror (errno); diff --git a/meta/packages/gettext/gettext-0.17/wchar-uclibc.patch b/meta/packages/gettext/gettext-0.17/wchar-uclibc.patch new file mode 100644 index 000000000..7b3880bf7 --- /dev/null +++ b/meta/packages/gettext/gettext-0.17/wchar-uclibc.patch @@ -0,0 +1,96 @@ +Index: gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h +=================================================================== +--- gettext-0.17.orig/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:51:52.336394636 +0200 ++++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:52:25.546430195 +0200 +@@ -1,6 +1,6 @@ + /* A substitute for ISO C99 , for platforms that have issues. + +- Copyright (C) 2007 Free Software Foundation, Inc. ++ Copyright (C) 2007-2008 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 +@@ -26,6 +26,14 @@ + * the declaration of wcwidth(). + */ + ++#ifdef __need_mbstate_t ++/* Special invocation convention inside uClibc header files. */ ++ ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@ ++ ++#else ++/* Normal invocation convention. */ ++ + #ifndef _GL_WCHAR_H + + /* Tru64 with Desktop Toolkit C has a bug: must be included before +@@ -80,3 +88,4 @@ + + #endif /* _GL_WCHAR_H */ + #endif /* _GL_WCHAR_H */ ++#endif +Index: gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h +=================================================================== +--- gettext-0.17.orig/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:03.886393956 +0200 ++++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:50.876388000 +0200 +@@ -1,6 +1,6 @@ + /* A substitute for ISO C99 , for platforms that have issues. + +- Copyright (C) 2007 Free Software Foundation, Inc. ++ Copyright (C) 2007-2008 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 +@@ -26,6 +26,14 @@ + * the declaration of wcwidth(). + */ + ++#ifdef __need_mbstate_t ++/* Special invocation convention inside uClibc header files. */ ++ ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@ ++ ++#else ++/* Normal invocation convention. */ ++ + #ifndef _GL_WCHAR_H + + /* Tru64 with Desktop Toolkit C has a bug: must be included before +@@ -80,3 +88,4 @@ + + #endif /* _GL_WCHAR_H */ + #endif /* _GL_WCHAR_H */ ++#endif +Index: gettext-0.17/gettext-tools/libgettextpo/wchar.in.h +=================================================================== +--- gettext-0.17.orig/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:51:58.826395009 +0200 ++++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:52:38.609723575 +0200 +@@ -1,6 +1,6 @@ + /* A substitute for ISO C99 , for platforms that have issues. + +- Copyright (C) 2007 Free Software Foundation, Inc. ++ Copyright (C) 2007-2008 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 +@@ -26,6 +26,14 @@ + * the declaration of wcwidth(). + */ + ++#ifdef __need_mbstate_t ++/* Special invocation convention inside uClibc header files. */ ++ ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@ ++ ++#else ++/* Normal invocation convention. */ ++ + #ifndef _GL_WCHAR_H + + /* Tru64 with Desktop Toolkit C has a bug: must be included before +@@ -80,3 +88,4 @@ + + #endif /* _GL_WCHAR_H */ + #endif /* _GL_WCHAR_H */ ++#endif -- cgit v1.2.3