[libgsf] Use newer gettext

[Morten Welinder <mortenw src gnome org>]

commit a7272c4553d3e56a57516244e211d06d9111e6b9
Author: Morten Welinder <terra gnome org>
Date:   Sat Jan 12 12:39:39 2019 -0500

    Use newer gettext
    
    Hand-merged from patch at https://gitlab.gnome.org/GNOME/libgsf/issues/7
    which no longer applies.

 .gitignore     |  3 ---
 Makefile.am    |  5 ----
 configure.ac   |  6 ++---
 po/.gitignore  |  2 --
 po/Makevars    | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in |  1 -
 6 files changed, 80 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2d698eb..1744590 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,9 +31,6 @@ build-stamp
 config-stamp
 ID
 .*.sw*
-intltool-extract*
-intltool-merge*
-intltool-update*
 INSTALL
 py-compile
 libgsf-gvfs-1.pc
diff --git a/Makefile.am b/Makefile.am
index 432f8d6..d72e0f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,14 +10,9 @@ endif
 SUBDIRS = po gsf gsf-win32 doc tools tests thumbnailer python
 
 EXTRA_DIST = BUGS HACKING      \
-       intltool-extract.in     \
-       intltool-merge.in       \
-       intltool-update.in      \
        libgsf-1.spec           \
        dumpdef.pl
 
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update
-
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc \
        --enable-schemas-install \
        --enable-introspection=auto \
diff --git a/configure.ac b/configure.ac
index a4af856..2437ad9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,10 +53,8 @@ AC_SYS_LARGEFILE
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 dnl Gettext/i18n stuff
-
-IT_PROG_INTLTOOL([0.35.0])
-
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.19.4])
+AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
diff --git a/po/.gitignore b/po/.gitignore
index 8146caf..5d6319a 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -10,7 +10,5 @@ libgsf.pot
 messages
 missing
 notexist
-.intltool-cache*
-.intltool-merge-cache
 po2tbl.sed.in
 stamp-it
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..579ebd1
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = no
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index cccbcec..b6eebc8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,5 @@
 # List of source files which contain translatable strings.
 # Please keep this file sorted alphabetically.
-[encoding: UTF-8]
 gsf/gsf-blob.c
 gsf/gsf-clip-data.c
 gsf/gsf-infile-msole.c