From 39e10b599021ef2abe992ee09c7c937fbe166a77 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 24 May 2011 14:53:51 -0700 Subject: gettext: Update to 0.18.1.1 Add Upstream Status tags to patches (From OE-Core rev: 13fff2baf108e07eaf2d7e4c982bbdf9089c6bad) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../gettext/gettext-0.18.1.1/autotools.patch | 64 +++++++++++++++++++ .../gettext-error_print_progname.patch | 15 +++++ .../gettext/gettext-0.18.1.1/m4fix.patch | 52 +++++++++++++++ .../gettext-0.18.1.1/use_open_properly.patch | 17 +++++ .../gettext/gettext-0.18.1.1/wchar-uclibc.patch | 74 ++++++++++++++++++++++ 5 files changed, 222 insertions(+) create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch create mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch (limited to 'meta/recipes-core/gettext/gettext-0.18.1.1') diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch new file mode 100644 index 0000000000..e4545fda3e --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch @@ -0,0 +1,64 @@ +Upstream-Status: Inappropriate [configuration] + +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/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch new file mode 100644 index 0000000000..4a1b2c6aec --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch @@ -0,0 +1,15 @@ +Upstream-Status: Pending + +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/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch new file mode 100644 index 0000000000..34930d1539 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch @@ -0,0 +1,52 @@ +When I try to `./autogen.sh --quick' CVS gettext, using git Autoconf, +things fall over like this (several instances): + +| gnulib-m4/openmp.m4:29: error: m4_copy: won't overwrite defined macro: +_AC_LANG_OPENMP(C++) +| gnulib-m4/openmp.m4:29: the top level +| autom4te: /usr/bin/m4 failed with exit status: 1 +| aclocal: autom4te failed with exit status: 1 + +I'm not quite sure whether an Autoconf bug/incompatibility is involved +here (therefore the Cc: to bug-autoconf). m4_copy wasn't documented in +earlier Autoconf releases, but there may still have been problematic +semantic changes, I don't know. + +Anyway, the following patch seems to fix it. OK to apply? + +Cheers, +Ralf + +2008-12-03 Ralf Wildenhues <[EMAIL PROTECTED]> + + * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or + newer. + +Upstream-Status: Pending + +Index: gettext-0.17/gettext-tools/gnulib-m4/openmp.m4 +=================================================================== +--- gettext-0.17.orig/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:00.437788710 +0000 ++++ gettext-0.17/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:50.697789220 +0000 +@@ -1,11 +1,13 @@ +-# openmp.m4 serial 4 +-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. ++# openmp.m4 serial 5 ++dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, + dnl with or without modifications, as long as this notice is preserved. + + dnl This file can be removed once we assume autoconf >= 2.62. + ++m4_version_prereq([2.62],, [ ++ + # _AC_LANG_OPENMP + # --------------- + # Expands to some language dependent source code for testing the presence of +@@ -90,3 +92,5 @@ + fi + AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS]) + ]) ++ ++]) diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch new file mode 100644 index 0000000000..a04a32dff9 --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch @@ -0,0 +1,17 @@ +Upstream-Status: Pending + +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/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch new file mode 100644 index 0000000000..34e3f1a34a --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch @@ -0,0 +1,74 @@ +Upstream-Status: Pending + +Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h +=================================================================== +--- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/wchar.in.h 2010-05-08 18:36:16.000000000 -0700 ++++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h 2011-05-25 16:28:38.656220937 -0700 +@@ -48,6 +48,14 @@ + #else + /* Normal invocation convention. */ + ++#ifdef __need_mbstate_t ++/* Special invocation convention inside uClibc header files. */ ++ ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@ ++ ++#else ++/* Normal invocation convention. */ ++ + #ifndef _GL_WCHAR_H + + #define _GL_ALREADY_INCLUDING_WCHAR_H +@@ -426,3 +434,4 @@ + #endif /* _GL_WCHAR_H */ + #endif /* _GL_WCHAR_H */ + #endif ++#endif +Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h +=================================================================== +--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/wchar.in.h 2010-05-24 02:42:48.000000000 -0700 ++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h 2011-05-25 16:28:15.717360791 -0700 +@@ -48,6 +48,14 @@ + #else + /* Normal invocation convention. */ + ++#ifdef __need_mbstate_t ++/* Special invocation convention inside uClibc header files. */ ++ ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@ ++ ++#else ++/* Normal invocation convention. */ ++ + #ifndef _GL_WCHAR_H + + #define _GL_ALREADY_INCLUDING_WCHAR_H +@@ -426,3 +434,4 @@ + #endif /* _GL_WCHAR_H */ + #endif /* _GL_WCHAR_H */ + #endif ++#endif +Index: gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h +=================================================================== +--- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/wchar.in.h 2010-05-08 18:38:04.000000000 -0700 ++++ gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h 2011-05-25 16:28:26.998721087 -0700 +@@ -48,6 +48,14 @@ + #else + /* Normal invocation convention. */ + ++#ifdef __need_mbstate_t ++/* Special invocation convention inside uClibc header files. */ ++ ++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@ ++ ++#else ++/* Normal invocation convention. */ ++ + #ifndef _GL_WCHAR_H + + #define _GL_ALREADY_INCLUDING_WCHAR_H +@@ -426,3 +434,4 @@ + #endif /* _GL_WCHAR_H */ + #endif /* _GL_WCHAR_H */ + #endif ++#endif -- cgit v1.2.3-54-g00ecf