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.16.1/disable_java.patch | 2 + .../gettext-0.16.1/fix_aclocal_version.patch | 2 + .../gettext-0.16.1/fix_gnu_source_circular.patch | 2 + .../gettext/gettext-0.16.1/fixchicken.patch | 2 + .../gettext/gettext-0.16.1/getline.m4.patch | 2 + .../gettext-autoconf-lib-link-no-L.patch | 2 + .../gettext-error_print_progname.patch | 2 + .../gettext/gettext-0.16.1/gettext-vpath.patch | 2 + .../gettext-0.16.1/hardcode_macro_version.patch | 2 + .../gettext/gettext-0.16.1/linklib_from_0.17.patch | 2 + .../gettext/gettext-0.17/autotools.patch | 62 -------------- .../gettext-error_print_progname.patch | 13 --- meta/recipes-core/gettext/gettext-0.17/m4fix.patch | 50 ----------- .../gettext/gettext-0.17/use_open_properly.patch | 15 ---- .../gettext/gettext-0.17/wchar-uclibc.patch | 96 ---------------------- .../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 +++++++++++++++++ meta/recipes-core/gettext/gettext_0.17.bb | 88 -------------------- meta/recipes-core/gettext/gettext_0.18.1.1.bb | 84 +++++++++++++++++++ 22 files changed, 326 insertions(+), 324 deletions(-) delete mode 100644 meta/recipes-core/gettext/gettext-0.17/autotools.patch delete mode 100644 meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch delete mode 100644 meta/recipes-core/gettext/gettext-0.17/m4fix.patch delete mode 100644 meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch delete mode 100644 meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch 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 delete mode 100644 meta/recipes-core/gettext/gettext_0.17.bb create mode 100644 meta/recipes-core/gettext/gettext_0.18.1.1.bb diff --git a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch index cf7dc55b68..2f8478acf8 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch @@ -2,6 +2,8 @@ # # Commented by: Saul Wold +Upstream-Status: Inappropriate [embedded] + Index: gettext-0.16.1/gettext-tools/configure.ac =================================================================== --- gettext-0.16.1.orig/gettext-tools/configure.ac 2006-11-27 09:02:01.000000000 -0800 diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch index 3796052a55..8fe7712204 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch @@ -2,6 +2,8 @@ This patch updates the required version number from 2.61 to the current 2.65 version of aclocal, this will need to be updated when we update aclocal +Upstream-Status: Inappropriate [configuration] + Signed-off-by Saul Wold Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch index 8b42f1b37d..d1c0bbb0d9 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch @@ -3,6 +3,8 @@ AC_USE_SYSTEM_EXTENSIONS. Thanks to Mark Hatle for the timely pointers and fixes. +Upstream-Status: Inappropriate [configuration] + Signed-off-by Saul Wold diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/extensions.m4 gettext.patched/gettext-runtime/gnulib-m4/extensions.m4 diff --git a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch index ef51056674..d6bb7b0d3a 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch @@ -2,6 +2,8 @@ # # Commented by: Saul Wold +Upstream-Status: Inappropriate [embedded] + Index: gettext-tools/m4/csharpcomp.m4 =================================================================== RCS file: /cvs/gettext/gettext/gettext-tools/m4/csharpcomp.m4,v diff --git a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch index f71d0e1d82..34965fce55 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch @@ -2,6 +2,8 @@ # # Commented by: Saul Wold +Upstream-Status: Inappropriate [configuration] + --- /gettext-tools/m4/orig-getline.m4 2003-07-18 18:11:37.000000000 +0300 +++ /gettext-tools/m4/getline.m4 2007-02-03 13:33:41.000000000 +0200 @@ -42,12 +42,23 @@ diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch index e8bb2f6a38..82775d6c97 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch @@ -2,6 +2,8 @@ # # Commented by: Saul Wold +Upstream-Status: Pending + --- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~ 2009-04-17 15:12:30.000000000 -0700 +++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4 2009-04-17 15:37:39.000000000 -0700 @@ -267,6 +267,9 @@ diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch index 96a2196a68..abb71959b2 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch @@ -2,6 +2,8 @@ # # Commented by: Saul Wold +Upstream-Status: Inappropriate [configuration] + diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h --- gettext-0.14.6/gettext-tools/lib/error.h 2005-05-20 16:03:42.000000000 -0500 +++ gettext-0.14.6-patched/gettext-tools/lib/error.h 2007-01-13 20:57:24.422168053 -0600 diff --git a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch index 62420b7e44..67b0a5ad34 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch @@ -2,6 +2,8 @@ # # Commented by: Saul Wold +Upstream-Status: Pending + Index: gettext-0.16.1/gettext-runtime/intl/Makefile.in =================================================================== --- gettext-0.16.1.orig/gettext-runtime/intl/Makefile.in 2006-11-27 09:02:00.000000000 -0800 diff --git a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch index ef57dc254a..82ed04d5cb 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch @@ -2,6 +2,8 @@ This patch hardcodes in version 0.17 for the GETTEXT_MACRO_VERSION, the version check is only part of 0.17 and will not affect any 0.16.1 operations +Upstream-Status: Inappropriate [configuration] + Signed-off-by: Saul Wold Index: gettext-0.16.1/gettext-runtime/m4/po.m4 diff --git a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch index 2b805c9d8b..3cbe867c41 100644 --- a/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch +++ b/meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch @@ -2,6 +2,8 @@ # # Commented by: Saul Wold +Upstream-Status: Inappropriate [configuration] + Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 =================================================================== --- gettext-0.16.1.orig/autoconf-lib-link/m4/lib-link.m4 2006-11-27 09:01:58.000000000 -0800 diff --git a/meta/recipes-core/gettext/gettext-0.17/autotools.patch b/meta/recipes-core/gettext/gettext-0.17/autotools.patch deleted file mode 100644 index 9f16b1881f..0000000000 --- a/meta/recipes-core/gettext/gettext-0.17/autotools.patch +++ /dev/null @@ -1,62 +0,0 @@ -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.17/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch deleted file mode 100644 index 0f67cd0b2e..0000000000 --- a/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch +++ /dev/null @@ -1,13 +0,0 @@ -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.17/m4fix.patch b/meta/recipes-core/gettext/gettext-0.17/m4fix.patch deleted file mode 100644 index a02457fab8..0000000000 --- a/meta/recipes-core/gettext/gettext-0.17/m4fix.patch +++ /dev/null @@ -1,50 +0,0 @@ -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. - -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.17/use_open_properly.patch b/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch deleted file mode 100644 index 111714b543..0000000000 --- a/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch +++ /dev/null @@ -1,15 +0,0 @@ -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.17/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch deleted file mode 100644 index 7b3880bf77..0000000000 --- a/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch +++ /dev/null @@ -1,96 +0,0 @@ -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 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 diff --git a/meta/recipes-core/gettext/gettext_0.17.bb b/meta/recipes-core/gettext/gettext_0.17.bb deleted file mode 100644 index ce5fc3e381..0000000000 --- a/meta/recipes-core/gettext/gettext_0.17.bb +++ /dev/null @@ -1,88 +0,0 @@ -SUMMARY = "Utilities and libraries for producing multi-lingual messages." -DESCRIPTION = "Gettext offers to programmers, translators, and even users, a well integrated set of tools and documentation. Specifically, the GNU `gettext' utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. These tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs themselves, a runtime library supporting the retrieval of translated messages, and a few stand-alone programs to massage in various ways the sets of translatable strings, or already translated strings." -HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" -SECTION = "libs" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -PR = "r5" -DEPENDS = "gettext-native virtual/libiconv ncurses expat" -DEPENDS_virtclass-native = "" -PROVIDES = "virtual/libintl virtual/gettext" -PROVIDES_virtclass-native = "" -CONFLICTS_${PN} = "proxy-libintl" -SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ - file://autotools.patch;patch=1 \ - file://wchar-uclibc.patch;patch=1 \ - file://use_open_properly.patch;patch=1 \ - file://m4fix.patch;patch=1 \ - " - -SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" -SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1" - -SRC_URI[md5sum] = "58a2bc6d39c0ba57823034d55d65d606" -SRC_URI[sha256sum] = "209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba" - -#PARALLEL_MAKE = "" - -inherit autotools - -EXTRA_OECONF += "--without-lispdir \ - --disable-csharp \ - --disable-libasprintf \ - --disable-java \ - --disable-native-java \ - --disable-openmp \ - --with-included-glib \ - --with-libncurses-prefix=${STAGING_LIBDIR}/.. \ - --without-emacs \ - " - -acpaths = '-I ${S}/autoconf-lib-link/m4/ \ - -I ${S}/gettext-runtime/m4 \ - -I ${S}/gettext-tools/m4' - - -# these lack the .x behind the .so, but shouldn't be in the -dev package -# Otherwise you get the following results: -# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz -# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz -# because gettext depends on gettext-dev, which pulls in more -dev packages: -# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk -# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk -# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk -# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk -PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc" - -FILES_gettext-runtime = "${bindir}/gettext \ - ${bindir}/ngettext \ - ${bindir}/envsubst \ - ${bindir}/gettext.sh \ - ${libdir}/libasprintf.so* \ - ${libdir}/GNU.Gettext.dll \ - " -FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so* \ - ${libdir}/charset.alias \ - " -FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ - ${includedir}/autosprintf.h \ - " -FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.a \ - ${includedir}/libintl.h \ - " -FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ - ${mandir}/man1/ngettext.* \ - ${mandir}/man1/envsubst.* \ - ${mandir}/man1/.* \ - ${mandir}/man3/* \ - ${docdir}/gettext/gettext.* \ - ${docdir}/gettext/ngettext.* \ - ${docdir}/gettext/envsubst.* \ - ${docdir}/gettext/*.3.html \ - ${datadir}/gettext/ABOUT-NLS \ - ${docdir}/gettext/csharpdoc/* \ - ${docdir}/libasprintf/autosprintf.html \ - ${infodir}/autosprintf.info \ - " -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb new file mode 100644 index 0000000000..fe1b2662a0 --- /dev/null +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb @@ -0,0 +1,84 @@ +SUMMARY = "Utilities and libraries for producing multi-lingual messages." +DESCRIPTION = "Gettext offers to programmers, translators, and even users, a well integrated set of tools and documentation. Specifically, the GNU `gettext' utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. These tools include a set of conventions about how programs should be written to support message catalogs, a directory and file naming organization for the message catalogs themselves, a runtime library supporting the retrieval of translated messages, and a few stand-alone programs to massage in various ways the sets of translatable strings, or already translated strings." +HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html" +SECTION = "libs" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PR = "r0" +DEPENDS = "gettext-native virtual/libiconv ncurses expat" +DEPENDS_virtclass-native = "" +PROVIDES = "virtual/libintl virtual/gettext" +PROVIDES_virtclass-native = "" +CONFLICTS_${PN} = "proxy-libintl" +SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ + file://wchar-uclibc.patch \ + " + +SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" +SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1" + +SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89" +SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9" + +#PARALLEL_MAKE = "" + +inherit autotools + +EXTRA_OECONF += "--without-lispdir \ + --disable-csharp \ + --disable-libasprintf \ + --disable-java \ + --disable-native-java \ + --disable-openmp \ + --with-included-glib \ + --with-libncurses-prefix=${STAGING_LIBDIR}/.. \ + --without-emacs \ + " + +acpaths = '-I ${S}/gettext-runtime/m4 \ + -I ${S}/gettext-tools/m4' + + +# these lack the .x behind the .so, but shouldn't be in the -dev package +# Otherwise you get the following results: +# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz +# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz +# because gettext depends on gettext-dev, which pulls in more -dev packages: +# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk +# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk +# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk +# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk +PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc" + +FILES_gettext-runtime = "${bindir}/gettext \ + ${bindir}/ngettext \ + ${bindir}/envsubst \ + ${bindir}/gettext.sh \ + ${libdir}/libasprintf.so* \ + ${libdir}/GNU.Gettext.dll \ + " +FILES_gettext-runtime_append_libc-uclibc = " ${libdir}/libintl.so* \ + ${libdir}/charset.alias \ + " +FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ + ${includedir}/autosprintf.h \ + " +FILES_gettext-runtime-dev_append_libc-uclibc = " ${libdir}/libintl.a \ + ${includedir}/libintl.h \ + " +FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ + ${mandir}/man1/ngettext.* \ + ${mandir}/man1/envsubst.* \ + ${mandir}/man1/.* \ + ${mandir}/man3/* \ + ${docdir}/gettext/gettext.* \ + ${docdir}/gettext/ngettext.* \ + ${docdir}/gettext/envsubst.* \ + ${docdir}/gettext/*.3.html \ + ${datadir}/gettext/ABOUT-NLS \ + ${docdir}/gettext/csharpdoc/* \ + ${docdir}/libasprintf/autosprintf.html \ + ${infodir}/autosprintf.info \ + " +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf