[tracker-miners/wip/piotrdrag/kill-intltool: 63/64] Remove intltool for good

[Debarshi Ray <debarshir src gnome org>]

commit 568d12d8357611445ff9541b650e3fbf95f0f8b4
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Thu Sep 27 23:50:07 2018 +0200

    Remove intltool for good
    
    Fixes https://gitlab.gnome.org/GNOME/tracker/issues/36

 .gitignore                                        | 3 ---
 meson.build                                       | 2 ++
 po/.gitignore                                     | 1 -
 src/miners/fs/meson.build                         | 7 ++++---
 src/miners/fs/tracker-miner-fs.desktop.in.in      | 5 ++---
 src/miners/rss/meson.build                        | 7 ++++---
 src/miners/rss/tracker-miner-rss.desktop.in.in    | 5 ++---
 src/tracker-extract/meson.build                   | 7 ++++---
 src/tracker-extract/tracker-extract.desktop.in.in | 5 ++---
 9 files changed, 20 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f7c26f2cc..c02b11952 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,9 +30,6 @@ depcomp
 gtk-doc.make
 install-sh
 install.rdf
-intltool-extract.in
-intltool-merge.in
-intltool-update.in
 libtool
 ltmain.sh
 missing
diff --git a/meson.build b/meson.build
index 683c16813..614398638 100644
--- a/meson.build
+++ b/meson.build
@@ -401,6 +401,8 @@ tracker_uninstalled_extract_rules_dir = join_paths(meson.current_build_dir(), 's
 tracker_uninstalled_writeback_modules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-writeback')
 
 gsettings_schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')
+po_dir = join_paths(meson.current_source_dir(), 'po')
+xdg_autostart_dir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')
 
 glib_compile_schemas = find_program('glib-compile-schemas')
 glib_mkenums = find_program('glib-mkenums')
diff --git a/po/.gitignore b/po/.gitignore
index 0b80cf88e..40a4430ab 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,7 +1,6 @@
 *.gmo
 *.header
 *.pot
-.intltool-merge-cache
 boldquot.sed
 insert-header.sin
 Makefile.in.in
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index b58bfbd71..2202640b9 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -51,12 +51,13 @@ desktop_file_untranslated = configure_file(
     output: 'tracker-miner-fs.desktop.in',
     configuration: conf)
 
-desktop_file = custom_target('tracker-miner-fs-desktop-file',
+i18n.merge_file('tracker-miner-fs-desktop-file',
+    type: 'desktop',
     input: desktop_file_untranslated,
     output: 'tracker-miner-fs.desktop',
-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 
'po'), '@INPUT@', '@OUTPUT@'],
+    po_dir: po_dir,
     install: true,
-    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+    install_dir: xdg_autostart_dir)
 
 if install_systemd_user_services
   configure_file(
diff --git a/src/miners/fs/tracker-miner-fs.desktop.in.in b/src/miners/fs/tracker-miner-fs.desktop.in.in
index 696cb0554..d8bc8d4e6 100644
--- a/src/miners/fs/tracker-miner-fs.desktop.in.in
+++ b/src/miners/fs/tracker-miner-fs.desktop.in.in
@@ -1,7 +1,6 @@
 [Desktop Entry]
-_Name=Tracker File System Miner
-_Comment=Crawls and processes files on the file system
-Icon=
+Name=Tracker File System Miner
+Comment=Crawls and processes files on the file system
 Exec=@libexecdir@/tracker-miner-fs
 Terminal=false
 Type=Application
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index 239394049..ef2060a52 100644
--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -28,12 +28,13 @@ desktop_file_untranslated = configure_file(
     output: 'tracker-miner-rss.desktop.in',
     configuration: conf)
 
-desktop_file = custom_target('tracker-miner-rss-desktop-file',
+i18n.merge_file('tracker-miner-rss-desktop-file',
+    type: 'desktop',
     input: desktop_file_untranslated,
     output: 'tracker-miner-rss.desktop',
-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 
'po'), '@INPUT@', '@OUTPUT@'],
+    po_dir: po_dir,
     install: true,
-    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+    install_dir: xdg_autostart_dir)
 
 if install_systemd_user_services
   configure_file(
diff --git a/src/miners/rss/tracker-miner-rss.desktop.in.in b/src/miners/rss/tracker-miner-rss.desktop.in.in
index 7d239d48c..4bf5394d2 100644
--- a/src/miners/rss/tracker-miner-rss.desktop.in.in
+++ b/src/miners/rss/tracker-miner-rss.desktop.in.in
@@ -1,7 +1,6 @@
 [Desktop Entry]
-_Name=Tracker RSS/ATOM Feeds Miner
-_Comment=Fetch RSS/ATOM feeds
-Icon=
+Name=Tracker RSS/ATOM Feeds Miner
+Comment=Fetch RSS/ATOM feeds
 Exec=@libexecdir@/tracker-miner-rss
 Terminal=false
 Type=Application
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index b8ab6baaa..abd6de33a 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -186,12 +186,13 @@ desktop_file_untranslated = configure_file(
   output: 'tracker-extract.desktop.in',
   configuration: conf)
 
-desktop_file = custom_target('tracker-extract-desktop-file',
+i18n.merge_file('tracker-extract-desktop-file',
+  type: 'desktop',
   input: desktop_file_untranslated,
   output: 'tracker-extract.desktop',
-  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), 
'@INPUT@', '@OUTPUT@'],
+  po_dir: po_dir,
   install: true,
-  install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+  install_dir: xdg_autostart_dir)
 
 if install_systemd_user_services
   configure_file(
diff --git a/src/tracker-extract/tracker-extract.desktop.in.in 
b/src/tracker-extract/tracker-extract.desktop.in.in
index 002237bce..426ee824e 100644
--- a/src/tracker-extract/tracker-extract.desktop.in.in
+++ b/src/tracker-extract/tracker-extract.desktop.in.in
@@ -1,7 +1,6 @@
 [Desktop Entry]
-_Name=Tracker Metadata Extractor
-_Comment=Extracts metadata from local files
-Icon=
+Name=Tracker Metadata Extractor
+Comment=Extracts metadata from local files
 Exec=@libexecdir@/tracker-extract
 Terminal=false
 Type=Application