From e3dadc9f28c24a8d182121d0246b3d9ec048846a Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 28 Nov 2019 18:47:39 +0100
Subject: gettext: adapt for version 0.20

Drop backported patch (new gettext includes the updates).

Drop version from the .bbappend (hopefully no version-specific
tweaks will be needed going forward).

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
---
 .../fix-gl_cv_prog_as_underscore-test.patch        | 67 ----------------------
 recipes-core/gettext/gettext_%.bbappend            | 12 ++++
 recipes-core/gettext/gettext_0.19.%.bbappend       | 13 -----
 3 files changed, 12 insertions(+), 80 deletions(-)
 delete mode 100644 recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch
 create mode 100644 recipes-core/gettext/gettext_%.bbappend
 delete mode 100644 recipes-core/gettext/gettext_0.19.%.bbappend

diff --git a/recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch b/recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch
deleted file mode 100644
index 636789f..0000000
--- a/recipes-core/gettext/gettext/fix-gl_cv_prog_as_underscore-test.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Backport gnulib fix for mingw into gettext's included version of gnulib
-
-http://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=68b6adebef05670a312fb92b05e7bd089d2ed43a
-
-Upstream-Status: Backport
-Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-
---- a/gettext-runtime/gnulib-m4/asm-underscore.m4
-+++ b/gettext-runtime/gnulib-m4/asm-underscore.m4
-@@ -27,11 +27,11 @@
- #endif
- int foo(void) { return 0; }
- EOF
-      # Look for the assembly language name in the .s file.
-      AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
--     if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
-+     if LC_ALL=C grep -E '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)' conftest.$gl_asmext >/dev/null; then
-        gl_cv_prog_as_underscore=yes
-      else
-        gl_cv_prog_as_underscore=no
-      fi
-      rm -f conftest*
---- a/gettext-runtime/configure
-+++ b/gettext-runtime/configure
-@@ -24601,11 +24601,11 @@
-   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; } >/dev/null 2>&1
--     if LC_ALL=C grep -E '(^|^a-zA-Z0-9_)_foo(^a-zA-Z0-9_|$)' conftest.$gl_asmext >/dev/null; then
-+     if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
-        gl_cv_prog_as_underscore=yes
-      else
-        gl_cv_prog_as_underscore=no
-      fi
-      rm -f conftest*
---- a/gettext-tools/gnulib-m4/asm-underscore.m4
-+++ b/gettext-tools/gnulib-m4/asm-underscore.m4
-@@ -27,11 +27,11 @@
- #endif
- int foo(void) { return 0; }
- EOF
-      # Look for the assembly language name in the .s file.
-      AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
--     if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
-+     if LC_ALL=C grep -E '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)' conftest.$gl_asmext >/dev/null; then
-        gl_cv_prog_as_underscore=yes
-      else
-        gl_cv_prog_as_underscore=no
-      fi
-      rm -f conftest*
---- a/gettext-tools/configure
-+++ b/gettext-tools/configure
-@@ -32284,11 +32284,11 @@
-   { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; } >/dev/null 2>&1
--     if LC_ALL=C grep -E '(^|^a-zA-Z0-9_)_foo(^a-zA-Z0-9_|$)' conftest.$gl_asmext >/dev/null; then
-+     if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
-        gl_cv_prog_as_underscore=yes
-      else
-        gl_cv_prog_as_underscore=no
-      fi
-      rm -f conftest*
diff --git a/recipes-core/gettext/gettext_%.bbappend b/recipes-core/gettext/gettext_%.bbappend
new file mode 100644
index 0000000..d518698
--- /dev/null
+++ b/recipes-core/gettext/gettext_%.bbappend
@@ -0,0 +1,12 @@
+EXTRA_OECONF_append_mingw32 = " --enable-static"
+
+FILESEXTRAPATHS_prepend_mingw32 := "${THISDIR}/${BPN}:"
+SRC_URI_append_mingw32 = " \
+		"
+
+FILES_libgettextlib_mingw32 = "${bindir}/libgettextlib-*.dll"
+FILES_libgettextsrc_mingw32 = "${bindir}/libgettextsrc-*.dll"
+
+PACKAGES_prepend_mingw32 = "libintl "
+FILES_libintl_mingw32 = "${bindir}/libintl*.dll"
+
diff --git a/recipes-core/gettext/gettext_0.19.%.bbappend b/recipes-core/gettext/gettext_0.19.%.bbappend
deleted file mode 100644
index 21749f3..0000000
--- a/recipes-core/gettext/gettext_0.19.%.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-EXTRA_OECONF_append_mingw32 = " --enable-static"
-
-FILESEXTRAPATHS_prepend_mingw32 := "${THISDIR}/${BPN}:"
-SRC_URI_append_mingw32 = " \
-		file://fix-gl_cv_prog_as_underscore-test.patch \
-		"
-
-FILES_libgettextlib_mingw32 = "${bindir}/libgettextlib-*.dll"
-FILES_libgettextsrc_mingw32 = "${bindir}/libgettextsrc-*.dll"
-
-PACKAGES_prepend_mingw32 = "libintl "
-FILES_libintl_mingw32 = "${bindir}/libintl*.dll"
-
-- 
cgit v1.2.3-54-g00ecf