summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-05-24 14:53:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-01 18:34:32 +0100
commit39e10b599021ef2abe992ee09c7c937fbe166a77 (patch)
treeab62cb19ac9b16d29cdfad679a963d4a7e5cb909
parentcbaca4e4fcc02711cff2a5c47b7dfc1b00baa32b (diff)
downloadpoky-39e10b599021ef2abe992ee09c7c937fbe166a77.tar.gz
gettext: Update to 0.18.1.1
Add Upstream Status tags to patches (From OE-Core rev: 13fff2baf108e07eaf2d7e4c982bbdf9089c6bad) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/disable_java.patch2
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/fix_aclocal_version.patch2
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/fix_gnu_source_circular.patch2
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/fixchicken.patch2
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/getline.m4.patch2
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/gettext-autoconf-lib-link-no-L.patch2
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/gettext-error_print_progname.patch2
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/gettext-vpath.patch2
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/hardcode_macro_version.patch2
-rw-r--r--meta/recipes-core/gettext/gettext-0.16.1/linklib_from_0.17.patch2
-rw-r--r--meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch96
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch (renamed from meta/recipes-core/gettext/gettext-0.17/autotools.patch)2
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch (renamed from meta/recipes-core/gettext/gettext-0.17/gettext-error_print_progname.patch)2
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch (renamed from meta/recipes-core/gettext/gettext-0.17/m4fix.patch)2
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch (renamed from meta/recipes-core/gettext/gettext-0.17/use_open_properly.patch)2
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch74
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.1.1.bb (renamed from meta/recipes-core/gettext/gettext_0.17.bb)14
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 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 @@
2# 2#
3# Commented by: Saul Wold <saul.wold@intel.com> 3# Commented by: Saul Wold <saul.wold@intel.com>
4 4
5Upstream-Status: Inappropriate [embedded]
6
5Index: gettext-0.16.1/gettext-tools/configure.ac 7Index: gettext-0.16.1/gettext-tools/configure.ac
6=================================================================== 8===================================================================
7--- gettext-0.16.1.orig/gettext-tools/configure.ac 2006-11-27 09:02:01.000000000 -0800 9--- 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
2current 2.65 version of aclocal, this will need to be updated 2current 2.65 version of aclocal, this will need to be updated
3when we update aclocal 3when we update aclocal
4 4
5Upstream-Status: Inappropriate [configuration]
6
5Signed-off-by Saul Wold <sgw@linux.intel.com> 7Signed-off-by Saul Wold <sgw@linux.intel.com>
6 8
7Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 9Index: 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.
3 3
4Thanks to Mark Hatle for the timely pointers and fixes. 4Thanks to Mark Hatle for the timely pointers and fixes.
5 5
6Upstream-Status: Inappropriate [configuration]
7
6Signed-off-by Saul Wold <sgw@linux.intel.com> 8Signed-off-by Saul Wold <sgw@linux.intel.com>
7 9
8diff -ru gettext-0.16.1/gettext-runtime/gnulib-m4/extensions.m4 gettext.patched/gettext-runtime/gnulib-m4/extensions.m4 10diff -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 @@
2# 2#
3# Commented by: Saul Wold <saul.wold@intel.com> 3# Commented by: Saul Wold <saul.wold@intel.com>
4 4
5Upstream-Status: Inappropriate [embedded]
6
5Index: gettext-tools/m4/csharpcomp.m4 7Index: gettext-tools/m4/csharpcomp.m4
6=================================================================== 8===================================================================
7RCS file: /cvs/gettext/gettext/gettext-tools/m4/csharpcomp.m4,v 9RCS 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 @@
2# 2#
3# Commented by: Saul Wold <saul.wold@intel.com> 3# Commented by: Saul Wold <saul.wold@intel.com>
4 4
5Upstream-Status: Inappropriate [configuration]
6
5--- /gettext-tools/m4/orig-getline.m4 2003-07-18 18:11:37.000000000 +0300 7--- /gettext-tools/m4/orig-getline.m4 2003-07-18 18:11:37.000000000 +0300
6+++ /gettext-tools/m4/getline.m4 2007-02-03 13:33:41.000000000 +0200 8+++ /gettext-tools/m4/getline.m4 2007-02-03 13:33:41.000000000 +0200
7@@ -42,12 +42,23 @@ 9@@ -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 @@
2# 2#
3# Commented by: Saul Wold <saul.wold@intel.com> 3# Commented by: Saul Wold <saul.wold@intel.com>
4 4
5Upstream-Status: Pending
6
5--- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~ 2009-04-17 15:12:30.000000000 -0700 7--- gettext-0.17/autoconf-lib-link/m4/lib-link.m4~ 2009-04-17 15:12:30.000000000 -0700
6+++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4 2009-04-17 15:37:39.000000000 -0700 8+++ gettext-0.17/autoconf-lib-link/m4/lib-link.m4 2009-04-17 15:37:39.000000000 -0700
7@@ -267,6 +267,9 @@ 9@@ -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 @@
2# 2#
3# Commented by: Saul Wold <saul.wold@intel.com> 3# Commented by: Saul Wold <saul.wold@intel.com>
4 4
5Upstream-Status: Inappropriate [configuration]
6
5diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h 7diff -ur gettext-0.14.6/gettext-tools/lib/error.h gettext-0.14.6-patched/gettext-tools/lib/error.h
6--- gettext-0.14.6/gettext-tools/lib/error.h 2005-05-20 16:03:42.000000000 -0500 8--- gettext-0.14.6/gettext-tools/lib/error.h 2005-05-20 16:03:42.000000000 -0500
7+++ gettext-0.14.6-patched/gettext-tools/lib/error.h 2007-01-13 20:57:24.422168053 -0600 9+++ 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 @@
2# 2#
3# Commented by: Saul Wold <saul.wold@intel.com> 3# Commented by: Saul Wold <saul.wold@intel.com>
4 4
5Upstream-Status: Pending
6
5Index: gettext-0.16.1/gettext-runtime/intl/Makefile.in 7Index: gettext-0.16.1/gettext-runtime/intl/Makefile.in
6=================================================================== 8===================================================================
7--- gettext-0.16.1.orig/gettext-runtime/intl/Makefile.in 2006-11-27 09:02:00.000000000 -0800 9--- 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,
2the version check is only part of 0.17 and will not affect any 0.16.1 2the version check is only part of 0.17 and will not affect any 0.16.1
3operations 3operations
4 4
5Upstream-Status: Inappropriate [configuration]
6
5Signed-off-by: Saul Wold <sgw@linux.intel.com> 7Signed-off-by: Saul Wold <sgw@linux.intel.com>
6 8
7Index: gettext-0.16.1/gettext-runtime/m4/po.m4 9Index: 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 @@
2# 2#
3# Commented by: Saul Wold <saul.wold@intel.com> 3# Commented by: Saul Wold <saul.wold@intel.com>
4 4
5Upstream-Status: Inappropriate [configuration]
6
5Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4 7Index: gettext-0.16.1/autoconf-lib-link/m4/lib-link.m4
6=================================================================== 8===================================================================
7--- gettext-0.16.1.orig/autoconf-lib-link/m4/lib-link.m4 2006-11-27 09:01:58.000000000 -0800 9--- 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 7b3880bf77..0000000000
--- a/meta/recipes-core/gettext/gettext-0.17/wchar-uclibc.patch
+++ /dev/null
@@ -1,96 +0,0 @@
1Index: gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h
2===================================================================
3--- gettext-0.17.orig/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:51:52.336394636 +0200
4+++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:52:25.546430195 +0200
5@@ -1,6 +1,6 @@
6 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
7
8- Copyright (C) 2007 Free Software Foundation, Inc.
9+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
10
11 This program is free software; you can redistribute it and/or modify
12 it under the terms of the GNU General Public License as published by
13@@ -26,6 +26,14 @@
14 * the declaration of wcwidth().
15 */
16
17+#ifdef __need_mbstate_t
18+/* Special invocation convention inside uClibc header files. */
19+
20+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
21+
22+#else
23+/* Normal invocation convention. */
24+
25 #ifndef _GL_WCHAR_H
26
27 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
28@@ -80,3 +88,4 @@
29
30 #endif /* _GL_WCHAR_H */
31 #endif /* _GL_WCHAR_H */
32+#endif
33Index: gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h
34===================================================================
35--- gettext-0.17.orig/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:03.886393956 +0200
36+++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:50.876388000 +0200
37@@ -1,6 +1,6 @@
38 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
39
40- Copyright (C) 2007 Free Software Foundation, Inc.
41+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
42
43 This program is free software; you can redistribute it and/or modify
44 it under the terms of the GNU General Public License as published by
45@@ -26,6 +26,14 @@
46 * the declaration of wcwidth().
47 */
48
49+#ifdef __need_mbstate_t
50+/* Special invocation convention inside uClibc header files. */
51+
52+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
53+
54+#else
55+/* Normal invocation convention. */
56+
57 #ifndef _GL_WCHAR_H
58
59 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
60@@ -80,3 +88,4 @@
61
62 #endif /* _GL_WCHAR_H */
63 #endif /* _GL_WCHAR_H */
64+#endif
65Index: gettext-0.17/gettext-tools/libgettextpo/wchar.in.h
66===================================================================
67--- gettext-0.17.orig/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:51:58.826395009 +0200
68+++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:52:38.609723575 +0200
69@@ -1,6 +1,6 @@
70 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
71
72- Copyright (C) 2007 Free Software Foundation, Inc.
73+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
74
75 This program is free software; you can redistribute it and/or modify
76 it under the terms of the GNU General Public License as published by
77@@ -26,6 +26,14 @@
78 * the declaration of wcwidth().
79 */
80
81+#ifdef __need_mbstate_t
82+/* Special invocation convention inside uClibc header files. */
83+
84+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
85+
86+#else
87+/* Normal invocation convention. */
88+
89 #ifndef _GL_WCHAR_H
90
91 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
92@@ -80,3 +88,4 @@
93
94 #endif /* _GL_WCHAR_H */
95 #endif /* _GL_WCHAR_H */
96+#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 9f16b1881f..e4545fda3e 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 @@
1Upstream-Status: Inappropriate [configuration]
2
1Index: gettext-0.17/gettext-runtime/man/Makefile.am 3Index: gettext-0.17/gettext-runtime/man/Makefile.am
2=================================================================== 4===================================================================
3--- gettext-0.17.orig/gettext-runtime/man/Makefile.am 2007-10-07 21:37:36.000000000 +0200 5--- 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 0f67cd0b2e..4a1b2c6aec 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 @@
1Upstream-Status: Pending
2
1Index: gettext-0.17/gettext-tools/libgettextpo/error.h 3Index: gettext-0.17/gettext-tools/libgettextpo/error.h
2=================================================================== 4===================================================================
3--- gettext-0.17.orig/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:25.561115527 +0200 5--- 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 a02457fab8..34930d1539 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
22 * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or 22 * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or
23 newer. 23 newer.
24 24
25Upstream-Status: Pending
26
25Index: gettext-0.17/gettext-tools/gnulib-m4/openmp.m4 27Index: gettext-0.17/gettext-tools/gnulib-m4/openmp.m4
26=================================================================== 28===================================================================
27--- gettext-0.17.orig/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:00.437788710 +0000 29--- 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 111714b543..a04a32dff9 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 @@
1Upstream-Status: Pending
2
1Index: gettext-0.17/gettext-tools/src/write-catalog.c 3Index: gettext-0.17/gettext-tools/src/write-catalog.c
2=================================================================== 4===================================================================
3--- gettext-0.17.orig/gettext-tools/src/write-catalog.c 2008-10-16 15:18:16.000000000 +0200 5--- 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 0000000000..34e3f1a34a
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch
@@ -0,0 +1,74 @@
1Upstream-Status: Pending
2
3Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h
4===================================================================
5--- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/wchar.in.h 2010-05-08 18:36:16.000000000 -0700
6+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/wchar.in.h 2011-05-25 16:28:38.656220937 -0700
7@@ -48,6 +48,14 @@
8 #else
9 /* Normal invocation convention. */
10
11+#ifdef __need_mbstate_t
12+/* Special invocation convention inside uClibc header files. */
13+
14+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
15+
16+#else
17+/* Normal invocation convention. */
18+
19 #ifndef _GL_WCHAR_H
20
21 #define _GL_ALREADY_INCLUDING_WCHAR_H
22@@ -426,3 +434,4 @@
23 #endif /* _GL_WCHAR_H */
24 #endif /* _GL_WCHAR_H */
25 #endif
26+#endif
27Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h
28===================================================================
29--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/wchar.in.h 2010-05-24 02:42:48.000000000 -0700
30+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/wchar.in.h 2011-05-25 16:28:15.717360791 -0700
31@@ -48,6 +48,14 @@
32 #else
33 /* Normal invocation convention. */
34
35+#ifdef __need_mbstate_t
36+/* Special invocation convention inside uClibc header files. */
37+
38+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
39+
40+#else
41+/* Normal invocation convention. */
42+
43 #ifndef _GL_WCHAR_H
44
45 #define _GL_ALREADY_INCLUDING_WCHAR_H
46@@ -426,3 +434,4 @@
47 #endif /* _GL_WCHAR_H */
48 #endif /* _GL_WCHAR_H */
49 #endif
50+#endif
51Index: gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h
52===================================================================
53--- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/wchar.in.h 2010-05-08 18:38:04.000000000 -0700
54+++ gettext-0.18.1.1/gettext-tools/libgettextpo/wchar.in.h 2011-05-25 16:28:26.998721087 -0700
55@@ -48,6 +48,14 @@
56 #else
57 /* Normal invocation convention. */
58
59+#ifdef __need_mbstate_t
60+/* Special invocation convention inside uClibc header files. */
61+
62+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
63+
64+#else
65+/* Normal invocation convention. */
66+
67 #ifndef _GL_WCHAR_H
68
69 #define _GL_ALREADY_INCLUDING_WCHAR_H
70@@ -426,3 +434,4 @@
71 #endif /* _GL_WCHAR_H */
72 #endif /* _GL_WCHAR_H */
73 #endif
74+#endif
diff --git a/meta/recipes-core/gettext/gettext_0.17.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index ce5fc3e381..fe1b2662a0 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"
5LICENSE = "GPLv3" 5LICENSE = "GPLv3"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7 7
8PR = "r5" 8PR = "r0"
9DEPENDS = "gettext-native virtual/libiconv ncurses expat" 9DEPENDS = "gettext-native virtual/libiconv ncurses expat"
10DEPENDS_virtclass-native = "" 10DEPENDS_virtclass-native = ""
11PROVIDES = "virtual/libintl virtual/gettext" 11PROVIDES = "virtual/libintl virtual/gettext"
12PROVIDES_virtclass-native = "" 12PROVIDES_virtclass-native = ""
13CONFLICTS_${PN} = "proxy-libintl" 13CONFLICTS_${PN} = "proxy-libintl"
14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 14SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
15 file://autotools.patch;patch=1 \ 15 file://wchar-uclibc.patch \
16 file://wchar-uclibc.patch;patch=1 \
17 file://use_open_properly.patch;patch=1 \
18 file://m4fix.patch;patch=1 \
19 " 16 "
20 17
21SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1" 18SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
22SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1" 19SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch;patch=1"
23 20
24SRC_URI[md5sum] = "58a2bc6d39c0ba57823034d55d65d606" 21SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89"
25SRC_URI[sha256sum] = "209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba" 22SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9"
26 23
27#PARALLEL_MAKE = "" 24#PARALLEL_MAKE = ""
28 25
@@ -39,8 +36,7 @@ EXTRA_OECONF += "--without-lispdir \
39 --without-emacs \ 36 --without-emacs \
40 " 37 "
41 38
42acpaths = '-I ${S}/autoconf-lib-link/m4/ \ 39acpaths = '-I ${S}/gettext-runtime/m4 \
43 -I ${S}/gettext-runtime/m4 \
44 -I ${S}/gettext-tools/m4' 40 -I ${S}/gettext-tools/m4'
45 41
46 42
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 11:08:32 +0000