summaryrefslogtreecommitdiff
path: root/meta/recipes-support/gnutls
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-02 14:38:02 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:10:52 +0000
commit206ebe842ba12db271133a80a3d095c0d659eb45 (patch)
treeebe645fafafd08a37b0baf53962b1d0532e452db /meta/recipes-support/gnutls
parent3ebc06c2f011da95fd6bed74c9e27b2148011ee7 (diff)
downloadopenembedded-core-206ebe842ba12db271133a80a3d095c0d659eb45.tar.gz
openembedded-core-206ebe842ba12db271133a80a3d095c0d659eb45.tar.bz2
openembedded-core-206ebe842ba12db271133a80a3d095c0d659eb45.tar.xz
openembedded-core-206ebe842ba12db271133a80a3d095c0d659eb45.zip
gnutls: more gettext version fixes
Address [YOCTO #1849] Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-support/gnutls')
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch23
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.14.bb2
2 files changed, 19 insertions, 6 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 a0da765b6..4c9137a65 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 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
+--- gnutls-2.12.14.orig/lib/po/Makefile.in.in
++++ gnutls-2.12.14/lib/po/Makefile.in.in
@@ -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.
@@ -20,9 +20,9 @@ Index: gnutls-2.12.14/lib/po/Makefile.in.in
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 @@
+--- gnutls-2.12.14.orig/lib/m4/po.m4
++++ gnutls-2.12.14/lib/m4/po.m4
+@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
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.
@@ -31,3 +31,16 @@ Index: gnutls-2.12.14/lib/m4/po.m4
dnl Perform the following tests also if --disable-nls has been given,
dnl because they are needed for "make dist" to work.
+Index: gnutls-2.12.14/lib/configure.ac
+===================================================================
+--- gnutls-2.12.14.orig/lib/configure.ac
++++ gnutls-2.12.14/lib/configure.ac
+@@ -39,7 +39,7 @@ AC_PROG_LIBTOOL
+ LIBGNUTLS_HOOKS
+
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+
+ AC_C_BIGENDIAN
+
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
index f521f1a67..045ba69d1 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}.1"
+PR = "${INC_PR}.3"
SRC_URI += "file://gnutls-openssl.patch \
file://configure-fix.patch \