[tracker/sam/common-file-utils] Move file-utils from libtracker-common into libtracker-data

[Sam Thursfield <sthursfield src gnome org>]

commit 910409a53cd4e6fa03ba97d4c10b404a0bbaeacb
Author: Sam Thursfield <sam afuera me uk>
Date:   Mon Sep 21 17:35:06 2020 +0200

    Move file-utils from libtracker-common into libtracker-data
    
    We only use these in one place, so we can move them there.
    
    This should fix https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/140
    in which the file-utils symbols conflict with those defined in
    libtracker-miners-common.
    
    The unit tests are gone, I'm not sure how to avoid that since we need
    to avoid exporting these functions.

 src/libtracker-common/meson.build                  |   1 -
 src/libtracker-common/tracker-common.h             |   1 -
 src/libtracker-data/meson.build                    |   1 +
 src/libtracker-data/tracker-db-manager.c           |   1 +
 .../tracker-file-utils.c                           |   0
 .../tracker-file-utils.h                           |   0
 tests/libtracker-common/meson.build                |   1 -
 tests/libtracker-common/tracker-file-utils-test.c  | 104 ---------------------
 tests/libtracker-common/tracker-utils-test.c       |   1 -
 9 files changed, 2 insertions(+), 108 deletions(-)
---
diff --git a/src/libtracker-common/meson.build b/src/libtracker-common/meson.build
index aff153637..716cc5056 100644
--- a/src/libtracker-common/meson.build
+++ b/src/libtracker-common/meson.build
@@ -13,7 +13,6 @@ tracker_common_enum_header = enums[1]
 tracker_common_sources = [
   'tracker-date-time.c',
   'tracker-debug.c',
-  'tracker-file-utils.c',
   'tracker-term-utils.c',
   'tracker-utils.c',
   'tracker-locale.c',
diff --git a/src/libtracker-common/tracker-common.h b/src/libtracker-common/tracker-common.h
index 5bc03c9bf..b826f9aad 100644
--- a/src/libtracker-common/tracker-common.h
+++ b/src/libtracker-common/tracker-common.h
@@ -30,7 +30,6 @@
 
 #include "tracker-date-time.h"
 #include "tracker-debug.h"
-#include "tracker-file-utils.h"
 #include "tracker-language.h"
 #include "tracker-parser.h"
 #include "tracker-term-utils.h"
diff --git a/src/libtracker-data/meson.build b/src/libtracker-data/meson.build
index b367edd12..5c1a8cfb5 100644
--- a/src/libtracker-data/meson.build
+++ b/src/libtracker-data/meson.build
@@ -20,6 +20,7 @@ libtracker_data = static_library('tracker-data',
     'tracker-db-interface.c',
     'tracker-db-interface-sqlite.c',
     'tracker-db-manager.c',
+    'tracker-file-utils.c',
     'tracker-namespace.c',
     'tracker-ontology.c',
     'tracker-ontologies.c',
diff --git a/src/libtracker-data/tracker-db-manager.c b/src/libtracker-data/tracker-db-manager.c
index 4eec98e11..580fae644 100644
--- a/src/libtracker-data/tracker-db-manager.c
+++ b/src/libtracker-data/tracker-db-manager.c
@@ -40,6 +40,7 @@
 #include "tracker-db-interface-sqlite.h"
 #include "tracker-db-interface.h"
 #include "tracker-data-manager.h"
+#include "tracker-file-utils.h"
 #include "tracker-uuid.h"
 
 #define UNKNOWN_STATUS 0.5
diff --git a/src/libtracker-common/tracker-file-utils.c b/src/libtracker-data/tracker-file-utils.c
similarity index 100%
rename from src/libtracker-common/tracker-file-utils.c
rename to src/libtracker-data/tracker-file-utils.c
diff --git a/src/libtracker-common/tracker-file-utils.h b/src/libtracker-data/tracker-file-utils.h
similarity index 100%
rename from src/libtracker-common/tracker-file-utils.h
rename to src/libtracker-data/tracker-file-utils.h
diff --git a/tests/libtracker-common/meson.build b/tests/libtracker-common/meson.build
index a748e57f1..1d48ae512 100644
--- a/tests/libtracker-common/meson.build
+++ b/tests/libtracker-common/meson.build
@@ -1,6 +1,5 @@
 libtracker_common_tests = [
     'date-time',
-    'file-utils',
     'utils',
 ]
 
diff --git a/tests/libtracker-common/tracker-utils-test.c b/tests/libtracker-common/tracker-utils-test.c
index 086c27185..b41f23990 100644
--- a/tests/libtracker-common/tracker-utils-test.c
+++ b/tests/libtracker-common/tracker-utils-test.c
@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include <glib-object.h>
-#include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-locale.h>
 #include <locale.h>