[gnome-build-meta/alatiera/libosinfo-git] Revert "elements/core-deps/libosinfo.bst: Build from tarball"

[Jordan Petridis <jpetridis src gnome org>]

commit 42cd359411670c39272c927ef32ca61384577727
Author: Jordan Petridis <jpetridis gnome org>
Date:   Mon Dec 2 19:25:09 2019 +0200

    Revert "elements/core-deps/libosinfo.bst: Build from tarball"
    
    This reverts commit 86441f581cc3264a4b3008f79781938d4154ca2c.

 elements/core-deps/libosinfo.bst                   |  7 ++-
 ...-minimum-gettext-requirement-rather-than-.patch | 59 ++++++++++++++++++++++
 2 files changed, 64 insertions(+), 2 deletions(-)
---
diff --git a/elements/core-deps/libosinfo.bst b/elements/core-deps/libosinfo.bst
index 7b3c91a9..df450411 100644
--- a/elements/core-deps/libosinfo.bst
+++ b/elements/core-deps/libosinfo.bst
@@ -1,11 +1,14 @@
 kind: autotools
 sources:
-- kind: tar
-  url: https://releases.pagure.org/libosinfo/libosinfo-1.6.0.tar.gz
+- kind: git_tag
+  url: gitlab_com:libosinfo/libosinfo.git
+  track: master
 - kind: local
   path: files/libosinfo/pci.ids
 - kind: local
   path: files/libosinfo/usb.ids
+- kind: patch
+  path: files/libosinfo/0001-build-Use-a-minimum-gettext-requirement-rather-than-.patch
 build-depends:
 - sdk/gtk-doc.bst
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
diff --git a/files/libosinfo/0001-build-Use-a-minimum-gettext-requirement-rather-than-.patch 
b/files/libosinfo/0001-build-Use-a-minimum-gettext-requirement-rather-than-.patch
new file mode 100644
index 00000000..4908749d
--- /dev/null
+++ b/files/libosinfo/0001-build-Use-a-minimum-gettext-requirement-rather-than-.patch
@@ -0,0 +1,59 @@
+From ceb1410f47c59f8aa8b8a197008cdd29ebd95904 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon gnome org>
+Date: Sun, 11 Aug 2019 19:11:28 +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 225d53b..e4cc6c4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,7 +14,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
+