Patchwork [4/6] gnutls: Fix fix-gettext-version.patch

login
register
mail settings
Submitter Khem Raj
Date Dec. 6, 2011, 5:21 a.m.
Message ID <7f16a07bec0dc3c5f0a8ec800cc66430e9010c5e.1323148566.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/16199/
State Accepted
Commit 03a8493e9dc4f6ff3416d1abf33ed623352d70d2
Headers show

Comments

Khem Raj - Dec. 6, 2011, 5:21 a.m.
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>
---
 .../gnutls-2.12.14/fix-gettext-version.patch       |   17 +++++++++++++++--
 meta/recipes-support/gnutls/gnutls_2.12.14.bb      |    2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

Patch

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 7a41120..a0da765 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 385bb2c..f521f1a 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 \