aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls
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:29:02 +0000
commit03a8493e9dc4f6ff3416d1abf33ed623352d70d2 (patch)
tree7c65bb2799b2bc1498f4d7ef01d638705290a1b2 /meta/recipes-support/gnutls
parent7f38cbef365c05d75563760f15b10284147c2de3 (diff)
downloadopenembedded-core-contrib-03a8493e9dc4f6ff3416d1abf33ed623352d70d2.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. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gnutls')
-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 7a41120792b..a0da765b60c 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>
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.
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
index 385bb2c3fda..f521f1a672f 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 @@
require gnutls.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
SRC_URI += "file://gnutls-openssl.patch \
file://configure-fix.patch \