[tracker-miners/sam/tracker-3.0-functional-tests: 2/3] Remove gsettings for tracker.git
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/sam/tracker-3.0-functional-tests: 2/3] Remove gsettings for tracker.git
- Date: Sat, 8 Feb 2020 19:00:14 +0000 (UTC)
commit d50b72c509e59e826179f13bb206aa9e1831f247
Author: Sam Thursfield <sam afuera me uk>
Date: Wed Feb 5 20:48:08 2020 +0100
Remove gsettings for tracker.git
Since tracker.git only exports a library, it doesn't have its own
gsettings schemas any more and we can remove some cruft.
data/meson.build | 28 ----------------------------
meson.build | 1 -
2 files changed, 29 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index fc9cc68f8..4a8bd0151 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -33,34 +33,6 @@ tracker_miners_settings_enums = custom_target('tracker-miners-common-settings-en
#
compile_schemas_deps = [tracker_miners_settings_enums]
-if get_option('tracker_core') == 'subproject'
- # Here we do an ugly dance to place GSettings schemas from tracker
- # and tracker-miners into the same directory. The `glib-compile-schemas`
- # tool cannot combine schemas from multiple directories, and the
- # GSETTINGS_SCHEMA_DIR environment variable cannot point to multiple
- # directories, so this appears to be our only option.
-
- foreach schema : tracker_gsettings_schemas
- target = configure_file(
- input: schema,
- output: '@PLAINNAME@',
- copy: true)
- endforeach
-
- dep = custom_target('tracker-store-settings-enums',
- input: tracker_common_enums_header,
- output: 'org.freedesktop.Tracker.enums.xml',
- command: [glib_mkenums,
- '--comments', '<!-- @comment@ -->',
- '--fhead', '<schemalist>',
- '--vhead', '<@type@ id="org.freedesktop.Tracker.@EnumName@">',
- '--vprod', ' <value nick="@valuenick@" value="@valuenum@"/>',
- '--vtail', ' </@type@>',
- '--ftail', '</schemalist>', '@INPUT@'],
- capture: true)
- compile_schemas_deps += [dep]
-endif
-
custom_target('tracker-miners-compile-schemas',
output: 'gschemas.compiled',
command: [glib_compile_schemas, meson.current_build_dir()],
diff --git a/meson.build b/meson.build
index c583d2c6f..00c1be624 100644
--- a/meson.build
+++ b/meson.build
@@ -49,7 +49,6 @@ else
tracker_uninstalled_nepomuk_ontologies_dir =
tracker_subproject.get_variable('tracker_uninstalled_nepomuk_ontologies_dir')
tracker_common_enums_header = tracker_subproject.get_variable('tracker_common_enums_header')
- tracker_gsettings_schemas = tracker_subproject.get_variable('tracker_gsettings_schemas')
endif
avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]