summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-02 11:08:28 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:39 +0000
commitd05dd5275a8ba815e495788939e1fe3aa4a399d6 (patch)
tree185438c7bdc4083b22b798b007ad11f500737005
parent39237473e4e7df130886809ed9b462abb0e81c60 (diff)
downloadpoky-d05dd5275a8ba815e495788939e1fe3aa4a399d6.tar.gz
texinfo: fix gettext patch
(From OE-Core rev: 0a294c4aad43ecf04a40100e58050c7668f1a424) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch27
-rw-r--r--meta/recipes-extended/texinfo/texinfo_4.13a.bb2
2 files changed, 28 insertions, 1 deletions
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch
index 0a2e4917cb..6adeba5682 100644
--- a/meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch
+++ b/meta/recipes-extended/texinfo/texinfo-4.13a/gettext-macros.patch
@@ -3,6 +3,7 @@ Bump gettext macro numbers as required by newer gettext built by OE.
3Upstream-Status: Pending 3Upstream-Status: Pending
4 4
5Signed-off-by: Joshua Lock <josh@linux.intel.com> 5Signed-off-by: Joshua Lock <josh@linux.intel.com>
6Signed-off-by: Saul Wold <sgw@linux.intel.com>
6 7
7Index: texinfo-4.13/configure.ac 8Index: texinfo-4.13/configure.ac
8=================================================================== 9===================================================================
@@ -32,3 +33,29 @@ Index: texinfo-4.13/po/Makefile.in.in
32 33
33 PACKAGE = @PACKAGE@ 34 PACKAGE = @PACKAGE@
34 VERSION = @VERSION@ 35 VERSION = @VERSION@
36Index: texinfo-4.13/gnulib/m4/gnulib-comp.m4
37===================================================================
38--- texinfo-4.13.orig/gnulib/m4/gnulib-comp.m4
39+++ texinfo-4.13/gnulib/m4/gnulib-comp.m4
40@@ -56,7 +56,7 @@ AC_DEFUN([gl_INIT],
41 gl_EXITFAIL
42 gl_GETOPT
43 dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
44- AM_GNU_GETTEXT_VERSION([0.17])
45+ AM_GNU_GETTEXT_VERSION([0.18])
46 AC_SUBST([LIBINTL])
47 AC_SUBST([LTLIBINTL])
48 gl_FUNC_GETTIMEOFDAY
49Index: texinfo-4.13/gnulib/m4/po.m4
50===================================================================
51--- texinfo-4.13.orig/gnulib/m4/po.m4
52+++ texinfo-4.13/gnulib/m4/po.m4
53@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
54
55 dnl Release version of the gettext macros. This is used to ensure that
56 dnl the gettext macros and po/Makefile.in.in are in sync.
57- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
58+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
59
60 dnl Perform the following tests also if --disable-nls has been given,
61 dnl because they are needed for "make dist" to work.
diff --git a/meta/recipes-extended/texinfo/texinfo_4.13a.bb b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
index f205d4e04d..8ee56166eb 100644
--- a/meta/recipes-extended/texinfo/texinfo_4.13a.bb
+++ b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/texinfo/"
6SECTION = "console/utils" 6SECTION = "console/utils"
7LICENSE = "GPLv3+" 7LICENSE = "GPLv3+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010" 8LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010"
9PR = "r2" 9PR = "r3"
10 10
11DEPENDS = "zlib ncurses texinfo-native" 11DEPENDS = "zlib ncurses texinfo-native"
12DEPENDS_virtclass-native = "zlib-native ncurses-native" 12DEPENDS_virtclass-native = "zlib-native ncurses-native"