[tracker-miners/wip/piotrdrag/kill-intltool: 25/26] Remove intltool for good
- From: Piotr Drąg <piotrdrag src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/piotrdrag/kill-intltool: 25/26] Remove intltool for good
- Date: Sat, 9 Feb 2019 16:00:50 +0000 (UTC)
commit 3a32b7fe6944b179b0fb145282e51ce00c5daba7
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 -
po/POTFILES.skip | 1 -
src/miners/fs/meson.build | 7 ++++---
src/miners/fs/tracker-miner-fs.desktop.in.in | 9 ++-------
src/miners/rss/meson.build | 7 ++++---
src/miners/rss/tracker-miner-rss.desktop.in.in | 9 ++-------
src/tracker-extract/meson.build | 7 ++++---
src/tracker-extract/tracker-extract.desktop.in.in | 9 ++-------
.../org.freedesktop.Tracker.Writeback.gschema.xml | 4 ++--
11 files changed, 22 insertions(+), 37 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 ac21ba506..9fe4bef08 100644
--- a/meson.build
+++ b/meson.build
@@ -381,7 +381,9 @@ tracker_writeback_modules_dir = join_paths(get_option('prefix'), get_option('lib
tracker_uninstalled_extract_rules_dir = join_paths(meson.current_build_dir(), 'src', 'tracker-extract')
gsettings_schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')
+po_dir = join_paths(meson.current_source_dir(), 'po')
vapi_dir = join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi')
+xdg_autostart_dir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')
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/po/POTFILES.skip b/po/POTFILES.skip
index 9a65fdb28..933b057c7 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,5 @@
# List of source files that should NOT be translated.
# Please keep this file sorted alphabetically.
-src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in
src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
src/miners/fs/tracker-miner-fs.desktop.in
src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index 3cb46c7b1..7b5dd7124 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)
install_data('org.freedesktop.Tracker.Miner.Files.gschema.xml',
install_dir: gsettings_schema_dir)
diff --git a/src/miners/fs/tracker-miner-fs.desktop.in.in b/src/miners/fs/tracker-miner-fs.desktop.in.in
index 29d5364c6..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
@@ -12,7 +11,3 @@ X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
OnlyShowIn=GNOME;KDE;XFCE;X-IVI;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=tracker
-X-GNOME-Bugzilla-Component=Miners
-X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index 38949eca1..037d74a9f 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 49be40191..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
@@ -12,7 +11,3 @@ X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
OnlyShowIn=GNOME;KDE;XFCE;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=tracker
-X-GNOME-Bugzilla-Component=Miners
-X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index 2ffa90ba7..1c0c5e223 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -191,12 +191,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)
install_data('org.freedesktop.Tracker.Extract.gschema.xml',
install_dir: gsettings_schema_dir)
diff --git a/src/tracker-extract/tracker-extract.desktop.in.in
b/src/tracker-extract/tracker-extract.desktop.in.in
index 59fc0af2e..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
@@ -12,7 +11,3 @@ X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
OnlyShowIn=GNOME;KDE;XFCE;X-IVI;Unity;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=tracker
-X-GNOME-Bugzilla-Component=Extractor
-X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/src/tracker-writeback/org.freedesktop.Tracker.Writeback.gschema.xml
b/src/tracker-writeback/org.freedesktop.Tracker.Writeback.gschema.xml
index ba6b0e143..597bd8df4 100644
--- a/src/tracker-writeback/org.freedesktop.Tracker.Writeback.gschema.xml
+++ b/src/tracker-writeback/org.freedesktop.Tracker.Writeback.gschema.xml
@@ -21,8 +21,8 @@ Boston, MA 02110-1301, USA.
<schema id="org.freedesktop.Tracker.Writeback" path="/org/freedesktop/tracker/writeback/"
gettext-domain="tracker-miners">
<key name="verbosity" enum="org.freedesktop.TrackerMiners.TrackerVerbosity">
<default>'errors'</default>
- <_summary>Log verbosity</_summary>
- <_description>Log verbosity.</_description>
+ <summary>Log verbosity</summary>
+ <description>Log verbosity.</description>
</key>
</schema>
</schemalist>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]