gettext: Update to 0.18.1.1

Add Upstream Status tags to patches

Signed-off-by: Saul Wold <sgw@linux.intel.com>

17 files changed, 107 insertions, 105 deletions

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 cf7dc55b6..2f8478acf 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 <saul.wold@intel.com>
 
+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 3796052a5..8fe771220 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 <sgw@linux.intel.com>
 
 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 8b42f1b37..d1c0bbb0d 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 <sgw@linux.intel.com>
 
 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 ef5105667..d6bb7b0d3 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 <saul.wold@intel.com>
 
+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 f71d0e1d8..34965fce5 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 <saul.wold@intel.com>
 
+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 e8bb2f6a3..82775d6c9 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 <saul.wold@intel.com>
 
+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 96a2196a6..abb71959b 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 <saul.wold@intel.com>
 
+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 62420b7e4..67b0a5ad3 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 <saul.wold@intel.com>
 
+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 ef57dc254..82ed04d5c 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 <sgw@linux.intel.com>
 
 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 2b805c9d8..3cbe867c4 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 <saul.wold@intel.com>
 
+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/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
deleted file mode 100644
index 7b3880bf7..000000000
--- 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 <wchar.h>, 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: <stdio.h> 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 <wchar.h>, 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: <stdio.h> 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 <wchar.h>, 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: <stdio.h> 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.17/autotools.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
index 9f16b1881..e4545fda3 100644
--- a/meta/recipes-core/gettext/gettext-0.17/autotools.patch
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
@@ -1,3 +1,5 @@
+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
diff --git a/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
index 0f67cd0b2..4a1b2c6ae 100644
--- a/meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
@@ -1,3 +1,5 @@
+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
diff --git a/meta/recipes-core/gettext/gettext-0.17/m4fix.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
index a02457fab..34930d153 100644
--- a/meta/recipes-core/gettext/gettext-0.17/m4fix.patch
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
@@ -22,6 +22,8 @@ Ralf
         * 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
diff --git a/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
index 111714b54..a04a32dff 100644
--- a/meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
@@ -1,3 +1,5 @@
+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
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 000000000..34e3f1a34
--- /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.18.1.1.bb
index ce5fc3e38..fe1b2662a 100644
--- a/meta/recipes-core/gettext/gettext_0.17.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,24 +5,21 @@ SECTION = "libs"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r5"
+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://autotools.patch;patch=1 \
-           file://wchar-uclibc.patch;patch=1 \
-           file://use_open_properly.patch;patch=1 \
-           file://m4fix.patch;patch=1 \
+           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] = "58a2bc6d39c0ba57823034d55d65d606"
-SRC_URI[sha256sum] = "209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba"
+SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89"
+SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9"
 
 #PARALLEL_MAKE = ""
 
@@ -39,8 +36,7 @@ EXTRA_OECONF += "--without-lispdir \
                  --without-emacs \
                 "
 
-acpaths = '-I ${S}/autoconf-lib-link/m4/ \
-           -I ${S}/gettext-runtime/m4 \
+acpaths = '-I ${S}/gettext-runtime/m4 \
            -I ${S}/gettext-tools/m4'