[vte/wip/inigomartinez/gettext] build: Migrate from Intltool to Gettext

[Iñigo Martínez <inigomartinez src gnome org>]

commit bbe57f807eea9cb5c2ce41d7d254c5ad94c9bcdd
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Mon Jan 21 12:10:45 2019 +0100

    build: Migrate from Intltool to Gettext
    
    Recent versions of Gettext are able to translate several formats
    that are used in GNOME applications. This patch migrates from
    Intltool to Gettext using meson's i18n capabilities.

 glade/meson.build                   | 18 +++---------------
 glade/{vte.xml.in.in => vte.xml.in} |  0
 po/POTFILES.in                      |  2 ++
 po/POTFILES.skip                    |  4 +++-
 4 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/glade/meson.build b/glade/meson.build
index 87f2e7ea..5281489b 100644
--- a/glade/meson.build
+++ b/glade/meson.build
@@ -1,23 +1,11 @@
-vte_xml = 'vte.xml'
-vte_glade_xml = vte_api_name + '.xml'
-
 vte_conf = configuration_data()
 vte_conf.set('VTE_API_VERSION', vte_api_version)
 vte_conf.set('VERSION', vte_version)
 
-vte_glade_in = configure_file(
-  input: vte_xml + '.in.in',
-  output: vte_glade_xml + '.in',
+vte_glade = configure_file(
+  input: 'vte.xml.in',
+  output: vte_api_name + '.xml',
   configuration: vte_conf,
-)
-
-intltool_cache = po_dir / '.intltool-merge-cache'
-
-vte_glade = custom_target(
-  vte_glade_xml,
-  input: vte_glade_in,
-  output: '@BASENAME@',
-  command: [find_program('intltool-merge'), '-x', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@'],
   install: true,
   install_dir: glade_catalogdir,
 )
diff --git a/glade/vte.xml.in.in b/glade/vte.xml.in
similarity index 100%
rename from glade/vte.xml.in.in
rename to glade/vte.xml.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 69e94a0a..9cad3378 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,5 @@
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
 src/pty.cc
 src/vte.cc
 src/vtegtk.cc
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index be9e5e18..4e476cd1 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,7 +1,9 @@
+# List of source files that should *not* be translated.
+# Please keep this file sorted alphabetically.
 bindings/vala/app.ui
 bindings/vala/search-popover.ui
-src/vtespawn.cc
 src/app/app.cc
 src/app/appmenu.ui
 src/app/search-popover.ui
 src/app/window.ui
+src/vtespawn.cc