Skip to contentSkip to conversation

Fix patches including po.m4

PATCH New Saul Wold 1 participant 4 messages Sep 23, 2013

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Fix patches including po.m4

This series fixes a patching issue I saw recently, it seems to occur when you have an already configured ${S}, which causes the po.m4 to be removed. Since the autotools.bbclass removed the bad version of po.m4 let's just remove the patches for them here also

Saul Wold (3):
texi2html: remove po.m4 patch
wget: remove po.m4 patch
gnutls: remove po.m4 patch

 .../texi2html/texi2html-5.0/fix_gettext_version.patch       | 13 -------------
 meta/recipes-extended/wget/wget-1.14/fix_makefile.patch     | 13 -------------
 .../recipes-support/gnutls/gnutls/fix-gettext-version.patch | 13 -------------
 3 files changed, 39 deletions(-)
Signature · 1 line
1.8.3.1
author
#1 lore raw

PATCH 1/3 texi2html: remove po.m4 patch

With the seperation of the sourcedir (S) and builddir (B), the po.m4 file is removed from S during autotools aclocal-copy creation and there no need to patch it since the aclocal-copy version is correct (has gettext version 0.18 specificed

---
 .../texi2html/texi2html-5.0/fix_gettext_version.patch       | 13 -------------
 1 file changed, 13 deletions(-)
meta/recipes-extended/texi2html/texi2html-5.0/fix_gettext_version.patch +0 -13
index 35c119b..d1c9fe5 100644
@@ -29,16 +29,3 @@ Index: texi2html-5.0/po_messages/Makefile.in.in
  
  PACKAGE = @PACKAGE@
  VERSION = @VERSION@
-Index: texi2html-5.0/m4/po.m4
-===================================================================
---- texi2html-5.0.orig/m4/po.m4
-+++ texi2html-5.0/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.
--  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.
Signature · 1 line
1.8.3.1
author
#2 lore raw

PATCH 2/3 wget: remove po.m4 patch

In reply to Saul Wold

With the seperation of the sourcedir (S) and builddir (B), the po.m4 file is removed from S during autotools aclocal-copy creation and there no need to patch it since the aclocal-copy version is correct (has gettext version 0.18 specificed

---
 meta/recipes-extended/wget/wget-1.14/fix_makefile.patch | 13 -------------
 1 file changed, 13 deletions(-)
meta/recipes-extended/wget/wget-1.14/fix_makefile.patch +0 -13
index b76a017..8ad7c62 100644
@@ -31,16 +31,3 @@ Index: wget-1.12/configure.ac
  
  AC_PROG_RANLIB
  
-Index: wget-1.12/m4/po.m4
-===================================================================
---- wget-1.12.orig/m4/po.m4	2009-09-04 09:31:54.000000000 -0700
-+++ wget-1.12/m4/po.m4	2011-10-19 20:33:53.426812176 -0700
-@@ -30,7 +30,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.
Signature · 1 line
1.8.3.1
author
#3 lore raw

PATCH 3/3 gnutls: remove po.m4 patch

In reply to Saul Wold

With the seperation of the sourcedir (S) and builddir (B), the po.m4 file is removed from S during autotools aclocal-copy creation and there no need to patch it since the aclocal-copy version is correct (has gettext version 0.18 specificed

---
 .../recipes-support/gnutls/gnutls/fix-gettext-version.patch | 13 -------------
 1 file changed, 13 deletions(-)
meta/recipes-support/gnutls/gnutls/fix-gettext-version.patch +0 -13
index 4c9137a..23db7e3 100644
@@ -18,19 +18,6 @@ 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
-+++ 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.
--  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.
 Index: gnutls-2.12.14/lib/configure.ac
 ===================================================================
 --- gnutls-2.12.14.orig/lib/configure.ac
Signature · 1 line
1.8.3.1