[gnome-build-meta] osinfo-db-tools: Make it compatible with newer gettext version

[Javier Jardón Cabezas <jjardon src gnome org>]

commit b81f01bf453e78ab283ac36181bc75e1e0daf5a7
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Aug 11 13:32:49 2019 +0100

    osinfo-db-tools: Make it compatible with newer gettext version

 elements/core-deps/osinfo-db-tools.bst             |  2 +
 ...-minimum-gettext-requirement-rather-than-.patch | 59 ++++++++++++++++++++++
 2 files changed, 61 insertions(+)
---
diff --git a/elements/core-deps/osinfo-db-tools.bst b/elements/core-deps/osinfo-db-tools.bst
index 5d904a08..8ed93fc7 100644
--- a/elements/core-deps/osinfo-db-tools.bst
+++ b/elements/core-deps/osinfo-db-tools.bst
@@ -3,6 +3,8 @@ sources:
 - kind: git_tag
   url: gitlab_com:libosinfo/osinfo-db-tools.git
   track: master
+- kind: patch
+  path: files/osinfo-db-tools/0001-build-Use-a-minimum-gettext-requirement-rather-than-.patch
 depends:
 - sdk/glib.bst
 - sdk/json-glib.bst
diff --git a/files/osinfo-db-tools/0001-build-Use-a-minimum-gettext-requirement-rather-than-.patch 
b/files/osinfo-db-tools/0001-build-Use-a-minimum-gettext-requirement-rather-than-.patch
new file mode 100644
index 00000000..0af81e18
--- /dev/null
+++ b/files/osinfo-db-tools/0001-build-Use-a-minimum-gettext-requirement-rather-than-.patch
@@ -0,0 +1,59 @@
+From 12101e1f004e9ebd96681192e4087e158bdef7fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon gnome org>
+Date: Sun, 11 Aug 2019 12:58:19 +0100
+Subject: [PATCH] build: Use a minimum gettext requirement rather than an exact
+ one
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In configure.ac, specify the minimum gettext version we require, rather
+than the exact one. This fixes a situation where the autoconf macros
+used for gettext will be the latest available on the system (for
+example, 0.19); but the copied-in Makefile.in.in will be for the exact
+version specified in configure.ac (in this case, 0.18).
+
+In that situation, the gettext build rules will error out at `make` time
+with the message:
+   *** error: gettext infrastructure mismatch: using a Makefile.in.in
+   from gettext version 0.18 but the autoconf macros are from gettext
+   version 0.19
+
+Avoid that by specifying a minimum version dependency rather than an
+exact one. This should not cause problems as we haven’t committed any
+generated or external gettext files into git, so each developer will end
+up regenerating the build system for their system’s version of gettext,
+as expected.
+
+See the subsection of
+https://www.gnu.org/software/gettext/manual/html_node/Version-Control-Issues.html
+for more information.
+
+Note that autoreconf currently doesn’t recognise
+AM_GNU_GETTEXT_REQUIRE_VERSION, so we must continue also using
+AM_GNU_GETTEXT_VERSION. autopoint will ignore the latter if the former
+is present. See
+https://lists.gnu.org/archive/html/autoconf-patches/2015-10/msg00000.html.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=777430
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 7470034..eb5f243 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,7 +40,9 @@ LIBOSINFO_COMPILE_WARNINGS
+ AM_MAINTAINER_MODE([enable])
+ 
+ # i18 support
++# FIXME: Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION
+ AM_GNU_GETTEXT_VERSION([0.19.7])
++AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.7])
+ AM_GNU_GETTEXT([external])
+ 
+ GETTEXT_PACKAGE=AC_PACKAGE_NAME
+-- 
+2.22.0
+