gnutls: Fix fix-gettext-version.patch

This patch did not cover all places to remove references
to gettext 0.17 therefore updated it.

(From OE-Core rev: 03a8493e9dc4f6ff3416d1abf33ed623352d70d2)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2011-12-05 21:21:19 -08:00
committed by Richard Purdie
parent 359770fc4c
commit 3859b14f18
2 changed files with 16 additions and 3 deletions

View File

@@ -5,8 +5,8 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com>
Index: gnutls-2.12.14/lib/po/Makefile.in.in
===================================================================
--- gnutls-2.12.14.orig/lib/po/Makefile.in.in 2011-11-28 20:15:56.000000000 -0800
+++ gnutls-2.12.14/lib/po/Makefile.in.in 2011-11-28 20:17:21.386078977 -0800
--- gnutls-2.12.14.orig/lib/po/Makefile.in.in 2009-11-01 01:43:00.000000000 -0800
+++ gnutls-2.12.14/lib/po/Makefile.in.in 2011-12-05 12:09:34.349552489 -0800
@@ -8,8 +8,8 @@
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
@@ -18,3 +18,16 @@ Index: gnutls-2.12.14/lib/po/Makefile.in.in
PACKAGE = @PACKAGE@
VERSION = @VERSION@
Index: gnutls-2.12.14/lib/m4/po.m4
===================================================================
--- gnutls-2.12.14.orig/lib/m4/po.m4 2011-12-05 12:12:34.000000000 -0800
+++ gnutls-2.12.14/lib/m4/po.m4 2011-12-05 12:12:49.429552465 -0800
@@ -29,7 +29,7 @@
dnl Release version of the gettext macros. This is used to ensure that
dnl the gettext macros and po/Makefile.in.in are in sync.
- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
dnl Perform the following tests also if --disable-nls has been given,
dnl because they are needed for "make dist" to work.

View File

@@ -1,6 +1,6 @@
require gnutls.inc
PR = "${INC_PR}.0"
PR = "${INC_PR}.1"
SRC_URI += "file://gnutls-openssl.patch \
file://configure-fix.patch \