summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-06-13 11:09:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-22 16:57:33 +0100
commitbde206b44762f62fac120d07fe747fa4721631fb (patch)
tree5bdad495f3e6a5e915692af4e59538c63b4f15b0
parenta82dd363737100fd7386875bd5edba6324e82893 (diff)
downloadpoky-bde206b44762f62fac120d07fe747fa4721631fb.tar.gz
gettext-0.18.1.1: Remove unused patches
gettext-error_print_progname.patch is already applied upstream others are unapplied. (From OE-Core rev: 439e7b3a871c1da02830761e0aa901514e24da0e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch64
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch15
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch52
-rw-r--r--meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch17
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.1.1.bb1
5 files changed, 0 insertions, 149 deletions
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
deleted file mode 100644
index e4545fda3e..0000000000
--- a/meta/recipes-core/gettext/gettext-0.18.1.1/autotools.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: gettext-0.17/gettext-runtime/man/Makefile.am
4===================================================================
5--- gettext-0.17.orig/gettext-runtime/man/Makefile.am 2007-10-07 21:37:36.000000000 +0200
6+++ gettext-0.17/gettext-runtime/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200
7@@ -158,8 +158,7 @@
8 $(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
9 mv t-$@ $@
10
11-install-html-local:
12- $(mkdir_p) $(DESTDIR)$(htmldir)
13+install-html: installdirs-html
14 for file in $(man_HTML); do \
15 if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
16 $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
17Index: gettext-0.17/gettext-tools/man/Makefile.am
18===================================================================
19--- gettext-0.17.orig/gettext-tools/man/Makefile.am 2007-10-28 00:18:37.000000000 +0200
20+++ gettext-0.17/gettext-tools/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200
21@@ -186,8 +186,7 @@
22 $(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
23 mv t-$@ $@
24
25-install-html-local:
26- $(mkdir_p) $(DESTDIR)$(htmldir)
27+install-html: installdirs-html
28 for file in $(man_HTML); do \
29 if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
30 $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
31Index: gettext-0.17/gettext-runtime/libasprintf/configure.ac
32===================================================================
33--- gettext-0.17.orig/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:42.000000000 +0200
34+++ gettext-0.17/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:54.000000000 +0200
35@@ -1,5 +1,5 @@
36 dnl Configuration for the GNU libasprintf library
37-dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
38+dnl Copyright (C) 2002-2007 Free Software Foundation, Inc.
39 dnl
40 dnl This program is free software: you can redistribute it and/or modify
41 dnl it under the terms of the GNU General Public License as published by
42@@ -54,8 +54,7 @@
43 dnl Checks for typedefs, structures, and compiler characteristics.
44 AC_C_INLINE
45 AC_TYPE_SIZE_T
46-gl_AC_TYPE_LONG_LONG
47-gt_TYPE_LONGDOUBLE
48+AC_TYPE_LONG_LONG_INT
49 gt_TYPE_WCHAR_T
50 gt_TYPE_WINT_T
51 AC_CHECK_TYPE([ptrdiff_t], ,
52@@ -79,8 +78,11 @@
53 AC_SUBST([ALLOCA_H])
54
55 AC_CHECK_FUNCS([snprintf vasprintf wcslen])
56-AC_CHECK_DECLS([_snprintf])
57+dnl Use the _snprintf function only if it is declared (because on NetBSD it
58+dnl is defined as a weak alias of snprintf; we prefer to use the latter).
59+AC_CHECK_DECLS([_snprintf], , , [#include <stdio.h>])
60 gt_PRINTF_POSIX
61+gl_EOVERFLOW
62
63 dnl Check for tools needed for formatting the documentation.
64 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
deleted file mode 100644
index 4a1b2c6aec..0000000000
--- a/meta/recipes-core/gettext/gettext-0.18.1.1/gettext-error_print_progname.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Pending
2
3Index: gettext-0.17/gettext-tools/libgettextpo/error.h
4===================================================================
5--- gettext-0.17.orig/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:25.561115527 +0200
6+++ gettext-0.17/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:52.454440505 +0200
7@@ -49,7 +49,7 @@
8 /* If NULL, error will flush stdout, then print on stderr the program
9 name, a colon and a space. Otherwise, error will call this
10 function without parameters instead. */
11-extern DLL_VARIABLE void (*error_print_progname) (void);
12+void (*error_print_progname) (void);
13
14 /* This variable is incremented each time `error' is called. */
15 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
deleted file mode 100644
index 34930d1539..0000000000
--- a/meta/recipes-core/gettext/gettext-0.18.1.1/m4fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1When I try to `./autogen.sh --quick' CVS gettext, using git Autoconf,
2things fall over like this (several instances):
3
4| gnulib-m4/openmp.m4:29: error: m4_copy: won't overwrite defined macro:
5_AC_LANG_OPENMP(C++)
6| gnulib-m4/openmp.m4:29: the top level
7| autom4te: /usr/bin/m4 failed with exit status: 1
8| aclocal: autom4te failed with exit status: 1
9
10I'm not quite sure whether an Autoconf bug/incompatibility is involved
11here (therefore the Cc: to bug-autoconf). m4_copy wasn't documented in
12earlier Autoconf releases, but there may still have been problematic
13semantic changes, I don't know.
14
15Anyway, the following patch seems to fix it. OK to apply?
16
17Cheers,
18Ralf
19
202008-12-03 Ralf Wildenhues <[EMAIL PROTECTED]>
21
22 * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or
23 newer.
24
25Upstream-Status: Pending
26
27Index: gettext-0.17/gettext-tools/gnulib-m4/openmp.m4
28===================================================================
29--- gettext-0.17.orig/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:00.437788710 +0000
30+++ gettext-0.17/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:50.697789220 +0000
31@@ -1,11 +1,13 @@
32-# openmp.m4 serial 4
33-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
34+# openmp.m4 serial 5
35+dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
36 dnl This file is free software; the Free Software Foundation
37 dnl gives unlimited permission to copy and/or distribute it,
38 dnl with or without modifications, as long as this notice is preserved.
39
40 dnl This file can be removed once we assume autoconf >= 2.62.
41
42+m4_version_prereq([2.62],, [
43+
44 # _AC_LANG_OPENMP
45 # ---------------
46 # Expands to some language dependent source code for testing the presence of
47@@ -90,3 +92,5 @@
48 fi
49 AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS])
50 ])
51+
52+])
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
deleted file mode 100644
index a04a32dff9..0000000000
--- a/meta/recipes-core/gettext/gettext-0.18.1.1/use_open_properly.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Pending
2
3Index: gettext-0.17/gettext-tools/src/write-catalog.c
4===================================================================
5--- gettext-0.17.orig/gettext-tools/src/write-catalog.c 2008-10-16 15:18:16.000000000 +0200
6+++ gettext-0.17/gettext-tools/src/write-catalog.c 2008-10-16 18:17:13.000000000 +0200
7@@ -220,7 +220,9 @@
8 /* Open the output file. */
9 if (!to_stdout)
10 {
11- fd = open (filename, O_WRONLY | O_CREAT);
12+ fd = open (filename, O_WRONLY | O_CREAT,
13+ /* 0666 in portable POSIX notation: */
14+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
15 if (fd < 0)
16 {
17 const char *errno_description = strerror (errno);
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index f54c1113a7..b64fbdb89b 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -15,7 +15,6 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
15 " 15 "
16 16
17SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ 17SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \
18 file://gettext-error_print_progname.patch \
19 file://gnulib-uclibc-sched_param-def.patch \ 18 file://gnulib-uclibc-sched_param-def.patch \
20 " 19 "
21 20