[polari] flatpak: Fix another gspell build error

[Florian Müllner <fmuellner src gnome org>]

commit 6e42f4e6d8e667dd1d16b46f355f50adad2fa5ea
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Aug 14 19:32:16 2019 +0200

    flatpak: Fix another gspell build error
    
    After the platform SDK updated gettext, there's another gspell build
    failure. Luckily the issue is already fixed on the master branch, so
    grab the appropriate commit to get things going again.

 flatpak/gspell-gettext-fix.patch | 48 ++++++++++++++++++++++++++++++++++++++++
 flatpak/org.gnome.Polari.json    |  4 ++++
 2 files changed, 52 insertions(+)
---
diff --git a/flatpak/gspell-gettext-fix.patch b/flatpak/gspell-gettext-fix.patch
new file mode 100644
index 0000000..780fe02
--- /dev/null
+++ b/flatpak/gspell-gettext-fix.patch
@@ -0,0 +1,48 @@
+From 8bd7cac01d8cd27a25b48858843cb21e91f3952e Mon Sep 17 00:00:00 2001
+From: Ting-Wei Lan <lantw src gnome org>
+Date: Wed, 24 Jul 2019 16:38:39 +0800
+Subject: [PATCH] =?UTF-8?q?build:=20Allow=20building=20with=20gettext=20?=
+ =?UTF-8?q?=E2=89=A5=200.20?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The use of AM_GNU_GETTEXT_VERSION in configure.ac instructs autopoint to
+copy po/Makefile.in.in from the exact gettext version. It is fine if the
+version of gettext installed on the system has the same minor version
+number with the requested version, but it fails if you have a newer
+version of gettext because of the mismatch between autoconf macros and
+Makefile.in.in.
+
+  *** error: gettext infrastructure mismatch: using a Makefile.in.in
+  from gettext version 0.19 but the autoconf macros are from gettext
+  version 0.20
+
+Instead of specifying the exact version with AM_GNU_GETTEXT_VERSION, we
+can use AM_GNU_GETTEXT_REQUIRE_VERSION to ask autopoint to simply use
+the gettext version installed on the system to prevent the mismatch.
+
+This also bumps the version requirement on gettext to 0.19.6 because
+AM_GNU_GETTEXT_REQUIRE_VERSION was added in this version.
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9135987..189ba95 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -121,7 +121,9 @@ fi
+ 
+ # i18n
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.19.4])
++# FIXME: Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION
++AM_GNU_GETTEXT_VERSION([0.19.6])
++AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
+ AC_SUBST([GETTEXT_PACKAGE], [gspell-$GSPELL_API_VERSION])
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Define to the gettext package name.])
+ 
+-- 
+2.21.0
+
diff --git a/flatpak/org.gnome.Polari.json b/flatpak/org.gnome.Polari.json
index dc8fc91..2e3fd02 100644
--- a/flatpak/org.gnome.Polari.json
+++ b/flatpak/org.gnome.Polari.json
@@ -162,6 +162,10 @@
                 {
                     "type": "patch",
                     "path": "gspell-no-code-coverage.patch"
+                },
+                {
+                    "type": "patch",
+                    "path": "gspell-gettext-fix.patch"
                 }
             ],
             "cleanup": [