[tracker-miners: 34/34] Merge branch 'wip/carlosg/parallel-installable' into 'master'



commit e3fbdc2e81663b8a1175f1c9a61a8439be8776eb
Merge: 99bad3bdd 6a005a00a
Author: Sam Thursfield <sam afuera me uk>
Date:   Wed Apr 8 19:21:30 2020 +0000

    Merge branch 'wip/carlosg/parallel-installable' into 'master'
    
    Make parallel installable with Tracker 2.x
    
    See merge request GNOME/tracker-miners!175

 config-miners.h.meson.in                           |  19 --
 data/default.rule                                  |   2 +-
 data/meson.build                                   |  38 +--
 data/org.freedesktop.Tracker.Extract.gschema.xml   |   6 +-
 data/org.freedesktop.Tracker.FTS.gschema.xml       |   2 +-
 ...org.freedesktop.Tracker.Miner.Files.gschema.xml |   6 +-
 data/org.freedesktop.Tracker.Writeback.gschema.xml |   4 +-
 docs/manpages/meson.build                          |  43 +++-
 docs/manpages/tracker-daemon.1                     |   2 +-
 meson.build                                        |  27 +--
 meson_options.txt                                  |   2 -
 po/POTFILES.in                                     |   6 +-
 po/POTFILES.skip                                   |   8 +-
 po/meson.build                                     |   2 +-
 src/create-miner-symlinks.sh                       |   6 +-
 src/libtracker-miner/meson.build                   |  19 +-
 ...iner.xml => org.freedesktop.Tracker3.Miner.xml} |   2 +-
 src/libtracker-miner/tracker-miner-object.h        |  10 +-
 src/libtracker-miner/tracker-miner-proxy.c         |   6 +-
 .../libtracker-miners-common.vapi                  |   1 -
 src/libtracker-miners-common/meson.build           |   5 +-
 .../tracker-domain-ontology.c                      |  20 +-
 .../tracker-domain-ontology.h                      |   1 -
 src/libtracker-miners-common/tracker-fts-config.c  |   2 +-
 src/meson.build                                    |  14 --
 src/miners/fs/meson.build                          |  13 +-
 ....freedesktop.Tracker1.Miner.Files.service.in.in |  10 -
 ....freedesktop.Tracker3.Miner.Files.service.in.in |  10 +
 src/miners/fs/tracker-config.c                     |   2 +-
 src/miners/fs/tracker-extract-watchdog.c           |   2 +-
 src/miners/fs/tracker-main.c                       |  72 ++++--
 src/miners/fs/tracker-miner-files-index.c          |   2 +-
 src/miners/fs/tracker-miner-files-index.xml        |   2 +-
 src/miners/fs/tracker-miner-files.c                | 104 ++++++--
 src/miners/fs/tracker-miner-files.h                |  15 +-
 src/miners/fs/tracker-miner-fs.desktop.in.in       |   2 +-
 src/miners/fs/tracker-miner-fs.service.in          |   4 +-
 src/miners/fs/tracker-writeback-dispatcher.c       |   6 +-
 src/miners/fs/tracker-writeback-listener.c         |   6 +-
 src/miners/rss/meson.build                         |  13 +-
 ...rg.freedesktop.Tracker1.Miner.RSS.service.in.in |  10 -
 ...rg.freedesktop.Tracker3.Miner.RSS.service.in.in |  10 +
 src/miners/rss/tracker-main.c                      |  13 +-
 src/miners/rss/tracker-miner-rss.desktop.in.in     |   2 +-
 src/miners/rss/tracker-miner-rss.service.in        |   4 +-
 src/tracker-extract/meson.build                    |  14 +-
 ...reedesktop.Tracker1.Miner.Extract.service.in.in |  10 -
 ...reedesktop.Tracker3.Miner.Extract.service.in.in |  10 +
 src/tracker-extract/tracker-config.c               |   2 +-
 src/tracker-extract/tracker-extract-controller.c   |  14 +-
 src/tracker-extract/tracker-extract-decorator.c    |   2 +-
 src/tracker-extract/tracker-extract-priority.xml   |   2 +-
 src/tracker-extract/tracker-extract.desktop.in.in  |   2 +-
 src/tracker-extract/tracker-extract.h              |   6 +-
 src/tracker-extract/tracker-extract.service.in     |   4 +-
 src/tracker-extract/tracker-main.c                 |  28 +--
 src/tracker-writeback/meson.build                  |   8 +-
 .../org.freedesktop.Tracker1.Writeback.service.in  |   4 -
 .../org.freedesktop.Tracker3.Writeback.service.in  |   4 +
 src/tracker-writeback/tracker-config.c             |   2 +-
 src/tracker-writeback/tracker-writeback.c          |  10 +-
 src/tracker-writeback/tracker-writeback.service.in |   4 +-
 src/tracker-writeback/tracker-writeback.xml        |  11 +-
 src/tracker/meson.build                            |   2 +-
 src/tracker/tracker-daemon.c                       | 267 ++-------------------
 src/tracker/tracker-extract.c                      |   2 +-
 src/tracker/tracker-index.c                        |  14 +-
 src/tracker/tracker-miner-manager.c                |  22 +-
 src/tracker/tracker-process.c                      |  22 +-
 src/tracker/tracker-process.h                      |   2 -
 src/tracker/tracker-reset.c                        |  70 ++----
 src/tracker/tracker-search.c                       |  50 +---
 src/tracker/tracker-status.c                       |  10 +-
 src/tracker/tracker-tag.c                          |   2 +-
 tests/estress/abstract_engine.py                   |   4 +-
 tests/estress/abstract_text_engine.py              |   6 +-
 tests/estress/client.py                            |   6 +-
 tests/functional-tests/fixtures.py                 |   4 +-
 tests/functional-tests/minerfshelper.py            |  12 +-
 tests/libtracker-miner/miners-mock.h               |   4 +-
 .../mock-miners/mock-miner-1.desktop               |   4 +-
 .../mock-miners/mock-miner-2.desktop               |   4 +-
 tests/services/meson.build                         |  12 +-
 tests/services/miners/meson.build                  |   8 +-
 ...g.freedesktop.Tracker1.Miner.Extract.service.in |   9 -
 ...org.freedesktop.Tracker1.Miner.Files.service.in |   9 -
 .../org.freedesktop.Tracker1.Writeback.service.in  |   4 -
 ...g.freedesktop.Tracker3.Miner.Extract.service.in |   9 +
 ...org.freedesktop.Tracker3.Miner.Files.service.in |   9 +
 .../org.freedesktop.Tracker3.Writeback.service.in  |   4 +
 90 files changed, 485 insertions(+), 778 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]