From c84c8666581bfd64b21498330925146d8fe81075 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 9 Nov 2017 10:12:14 +0800 Subject: [PATCH] gawk: upgrade to 4.2.0 test-arrayind1-Remove-hashbang-line.patch is dropped as it has been merged in new version. Signed-off-by: Chen Qi Signed-off-by: Ross Burton --- .../test-arrayind1-Remove-hashbang-line.patch | 30 ------------------- .../gawk/{gawk-4.1.4 => gawk}/run-ptest | 0 .../gawk/{gawk_4.1.4.bb => gawk_4.2.0.bb} | 5 ++-- 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch rename meta/recipes-extended/gawk/{gawk-4.1.4 => gawk}/run-ptest (100%) rename meta/recipes-extended/gawk/{gawk_4.1.4.bb => gawk_4.2.0.bb} (85%) diff --git a/meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch b/meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch deleted file mode 100644 index d4262ed0d9..0000000000 --- a/meta/recipes-extended/gawk/gawk-4.1.4/test-arrayind1-Remove-hashbang-line.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a3a3f26078223c47871c7b53e5c015ad163ae045 Mon Sep 17 00:00:00 2001 -From: Fabio Berton -Date: Thu, 3 Nov 2016 14:50:52 -0200 -Subject: [PATCH] test/arrayind1: Remove hashbang line -Organization: O.S. Systems Software LTDA. - -Remove "#!/usr/local/bin/awk -f" as none of the other awk scripts in the -test suite have a hashbang. - -Upstream-Status: Submitted [1] - -[1] https://lists.gnu.org/archive/html/bug-gawk/2016-11/msg00003.html - -Signed-off-by: Fabio Berton ---- - test/arrayind1.awk | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/test/arrayind1.awk b/test/arrayind1.awk -index 5d4a6f3..59e8b4e 100755 ---- a/test/arrayind1.awk -+++ b/test/arrayind1.awk -@@ -1,4 +1,3 @@ --#!/usr/local/bin/awk -f - # this script renums pedigrees with metafounders - # so that they are added *before*regular animals - # mf are ascertained because they are not in the 1st column --- -2.1.4 - diff --git a/meta/recipes-extended/gawk/gawk-4.1.4/run-ptest b/meta/recipes-extended/gawk/gawk/run-ptest similarity index 100% rename from meta/recipes-extended/gawk/gawk-4.1.4/run-ptest rename to meta/recipes-extended/gawk/gawk/run-ptest diff --git a/meta/recipes-extended/gawk/gawk_4.1.4.bb b/meta/recipes-extended/gawk/gawk_4.2.0.bb similarity index 85% rename from meta/recipes-extended/gawk/gawk_4.1.4.bb rename to meta/recipes-extended/gawk/gawk_4.2.0.bb index 995d37d2ad..27f79a2bed 100644 --- a/meta/recipes-extended/gawk/gawk_4.1.4.bb +++ b/meta/recipes-extended/gawk/gawk_4.2.0.bb @@ -17,11 +17,10 @@ PACKAGECONFIG[mpfr] = "--with-mpfr,--without-mpfr, mpfr" SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ file://run-ptest \ - file://test-arrayind1-Remove-hashbang-line.patch \ " -SRC_URI[md5sum] = "f20c94ca51b6ebfc9bffb90f95c8ffbb" -SRC_URI[sha256sum] = "8c03080e2b5a56263e8783f6f1f306398d4591be18254041f3f547efef944d35" +SRC_URI[md5sum] = "0b598c31bc703d66082bd958d4189980" +SRC_URI[sha256sum] = "c88046c6e8396ee548bcb941e16def809b7b55b60a1044b5dd254094f347c7d9" inherit autotools gettext texinfo update-alternatives -- 2.40.1