summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-12-05 21:21:19 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-06 14:38:43 +0000
commit3859b14f18495e1755a5474a5bcd0da00dc9a90a (patch)
tree4e5c170f7726dbc2d0b417e7f9d1614065407ee1
parent359770fc4c6ed03e3e8bb96f2b3fc1ef8c9fdfc2 (diff)
downloadpoky-3859b14f18495e1755a5474a5bcd0da00dc9a90a.tar.gz
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>
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch17
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.14.bb2
2 files changed, 16 insertions, 3 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
index 7a41120792..a0da765b60 100644
--- a/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
@@ -5,8 +5,8 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com>
5 5
6Index: gnutls-2.12.14/lib/po/Makefile.in.in 6Index: gnutls-2.12.14/lib/po/Makefile.in.in
7=================================================================== 7===================================================================
8--- gnutls-2.12.14.orig/lib/po/Makefile.in.in 2011-11-28 20:15:56.000000000 -0800 8--- gnutls-2.12.14.orig/lib/po/Makefile.in.in 2009-11-01 01:43:00.000000000 -0800
9+++ gnutls-2.12.14/lib/po/Makefile.in.in 2011-11-28 20:17:21.386078977 -0800 9+++ gnutls-2.12.14/lib/po/Makefile.in.in 2011-12-05 12:09:34.349552489 -0800
10@@ -8,8 +8,8 @@ 10@@ -8,8 +8,8 @@
11 # Please note that the actual code of GNU gettext is covered by the GNU 11 # Please note that the actual code of GNU gettext is covered by the GNU
12 # General Public License and is *not* in the public domain. 12 # General Public License and is *not* in the public domain.
@@ -18,3 +18,16 @@ Index: gnutls-2.12.14/lib/po/Makefile.in.in
18 18
19 PACKAGE = @PACKAGE@ 19 PACKAGE = @PACKAGE@
20 VERSION = @VERSION@ 20 VERSION = @VERSION@
21Index: gnutls-2.12.14/lib/m4/po.m4
22===================================================================
23--- gnutls-2.12.14.orig/lib/m4/po.m4 2011-12-05 12:12:34.000000000 -0800
24+++ gnutls-2.12.14/lib/m4/po.m4 2011-12-05 12:12:49.429552465 -0800
25@@ -29,7 +29,7 @@
26
27 dnl Release version of the gettext macros. This is used to ensure that
28 dnl the gettext macros and po/Makefile.in.in are in sync.
29- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
30+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
31
32 dnl Perform the following tests also if --disable-nls has been given,
33 dnl because they are needed for "make dist" to work.
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
index 385bb2c3fd..f521f1a672 100644
--- a/meta/recipes-support/gnutls/gnutls_2.12.14.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
@@ -1,6 +1,6 @@
1require gnutls.inc 1require gnutls.inc
2 2
3PR = "${INC_PR}.0" 3PR = "${INC_PR}.1"
4 4
5SRC_URI += "file://gnutls-openssl.patch \ 5SRC_URI += "file://gnutls-openssl.patch \
6 file://configure-fix.patch \ 6 file://configure-fix.patch \