sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

gnutls: more gettext version fixes 

Address [YOCTO #1849]

(From OE-Core rev: 206ebe842ba12db271133a80a3d095c0d659eb45)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2012-01-02 14:38:02 -08:00 committed by Richard Purdie
parent 8eb45acf30
commit 78a3b1e5eb
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
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 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

2
meta/recipes-support/gnutls/gnutls_2.12.14.bb
View File

@ -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 \