[gnome-session] build: Migrate from Intltool to Gettext

[Ray Strode <halfline src gnome org>]

commit 145ef74eb05c62a1e660b0f994a48d5d1d460e3b
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Mon Sep 18 19:32:40 2017 +0200

    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 by using meson's i18n features.
    
    The empty Icon= lines have been removed because they are unused,
    and gettext can't handle empty values properly.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=787857

 data/gnome-custom-session.desktop.in   |    4 ++--
 data/gnome-dummy.session.desktop.in.in |    2 +-
 data/gnome-xorg.desktop.in             |    5 ++---
 data/gnome.desktop.in                  |    5 ++---
 data/gnome.session.desktop.in.in       |    2 +-
 data/meson.build                       |   20 ++++++++++++--------
 meson.build                            |    4 ----
 7 files changed, 20 insertions(+), 22 deletions(-)
---
diff --git a/data/gnome-custom-session.desktop.in b/data/gnome-custom-session.desktop.in
index ae36952..bd9a077 100644
--- a/data/gnome-custom-session.desktop.in
+++ b/data/gnome-custom-session.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Custom
-_Comment=This entry lets you select a saved session
+Name=Custom
+Comment=This entry lets you select a saved session
 Exec=gnome-session-custom-session
 TryExec=gnome-session-custom-session
diff --git a/data/gnome-dummy.session.desktop.in.in b/data/gnome-dummy.session.desktop.in.in
index f5a6d80..1052346 100644
--- a/data/gnome-dummy.session.desktop.in.in
+++ b/data/gnome-dummy.session.desktop.in.in
@@ -1,2 +1,2 @@
 [GNOME Session]
-_Name=GNOME dummy
+Name=GNOME dummy
diff --git a/data/gnome-xorg.desktop.in b/data/gnome-xorg.desktop.in
index d00b3dc..8ddeb85 100644
--- a/data/gnome-xorg.desktop.in
+++ b/data/gnome-xorg.desktop.in
@@ -1,8 +1,7 @@
 [Desktop Entry]
-_Name=GNOME on Xorg
-_Comment=This session logs you into GNOME
+Name=GNOME on Xorg
+Comment=This session logs you into GNOME
 Exec=gnome-session
 TryExec=gnome-session
-Icon=
 Type=Application
 DesktopNames=GNOME
diff --git a/data/gnome.desktop.in b/data/gnome.desktop.in
index b54b99c..7b78e94 100644
--- a/data/gnome.desktop.in
+++ b/data/gnome.desktop.in
@@ -1,8 +1,7 @@
 [Desktop Entry]
-_Name=GNOME
-_Comment=This session logs you into GNOME
+Name=GNOME
+Comment=This session logs you into GNOME
 Exec=gnome-session
 TryExec=gnome-session
-Icon=
 Type=Application
 DesktopNames=GNOME
diff --git a/data/gnome.session.desktop.in.in b/data/gnome.session.desktop.in.in
index f25cd25..9c59034 100644
--- a/data/gnome.session.desktop.in.in
+++ b/data/gnome.session.desktop.in.in
@@ -1,3 +1,3 @@
 [GNOME Session]
-_Name=GNOME
+Name=GNOME
 
RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;
diff --git a/data/meson.build b/data/meson.build
index bf7ecfa..89af98f 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -3,11 +3,12 @@ desktop = 'gnome.desktop'
 # FIXME: The same target can not be copied into two directories.
 #        There is a workaround in meson_post_install.py until proper solution arises:
 #        https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0
-custom_target(
+i18n.merge_file(
   desktop,
+  type: 'desktop',
   input: desktop + '.in',
   output: desktop,
-  command: intltool_desktop_cmd,
+  po_dir: po_dir,
   install: true,
   #install_dir: [
   #  join_paths(session_datadir, 'xsessions'),
@@ -18,11 +19,12 @@ custom_target(
 
 desktop = 'gnome-xorg.desktop'
 
-custom_target(
+i18n.merge_file(
   desktop,
+  type: 'desktop',
   input: desktop + '.in',
   output: desktop,
-  command: intltool_desktop_cmd,
+  po_dir: po_dir,
   install: true,
   install_dir: join_paths(session_datadir, 'xsessions')
 )
@@ -44,11 +46,12 @@ foreach session: sessions
     configuration: desktop_conf
   )
 
-  custom_target(
+  i18n.merge_file(
     session,
+    type: 'desktop',
     input: desktop_in,
     output: session,
-    command: intltool_desktop_cmd,
+    po_dir: po_dir,
     install: true,
     install_dir: join_paths(session_pkgdatadir, 'sessions')
   )
@@ -78,11 +81,12 @@ if enable_session_selector
 
   desktop = 'gnome-custom-session.desktop'
 
-  custom_target(
+  i18n.merge_file(
     desktop,
+    type: 'desktop',
     input: desktop + '.in',
     output: desktop,
-    command: intltool_desktop_cmd,
+    po_dir: po_dir,
     install: true,
     install_dir: join_paths(session_datadir, 'xsessions')
   )
diff --git a/meson.build b/meson.build
index e72a64e..4f239af 100644
--- a/meson.build
+++ b/meson.build
@@ -174,10 +174,6 @@ pkg = import('pkgconfig')
 
 po_dir = join_paths(meson.source_root(), 'po')
 
-intltool_merge = find_program('intltool-merge')
-intltool_cache = join_paths(po_dir, '.intltool-merge-cache')
-intltool_desktop_cmd = [intltool_merge, '-d', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
-
 top_inc = include_directories('.')
 
 subdir('gnome-session')