[tracker/wip/carlosg/rewrite-bus-impl: 5/5] build: Cleanse of Vala dependencies

[Carlos Garnacho <carlosg src gnome org>]

commit aea373bc44c40ef90b232e3cdff2905bcecfe460
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Jul 17 02:17:21 2022 +0200

    build: Cleanse of Vala dependencies
    
    Drop all the places left where we do specify things for Vala,
    and rename the targets that had that name because of vala code
    presence.

 .gitlab-ci.yml                               |  3 +--
 docs/reference/libtracker-sparql/meson.build |  2 +-
 meson.build                                  |  6 +-----
 src/libtracker-sparql/meson.build            | 23 +++++++----------------
 4 files changed, 10 insertions(+), 24 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25cdd5cec..347b26d02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,7 +107,7 @@ check-merge-request:
 .tracker.alpine@common:
   variables:
     BASE_TAG: '2022-03-07.0'
-    FDO_DISTRIBUTION_PACKAGES: 'alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev 
gobject-introspection-dev gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson py3-gobject3 
py3-setuptools py3-tappy sqlite-dev vala gcovr'
+    FDO_DISTRIBUTION_PACKAGES: 'alpine-sdk asciidoc bash-completion dbus dbus-dev git glib-dev 
gobject-introspection-dev gtk-doc icu-dev json-glib-dev libsoup-dev libxml2-dev meson py3-gobject3 
py3-setuptools py3-tappy sqlite-dev gcovr'
 
 .tracker.fedora:35@x86_64:
   extends: .tracker.fedora@common
@@ -294,7 +294,6 @@ build-alpine-latest@x86_64:
     - gcovr --root=.. --filter='\.\./src/'
         --exclude=../utils --exclude=../examples --exclude=../docs/reference
         --exclude='\.\./build/.*\.[ch]$' --exclude='.*/tests/.*\.[ch]$'
-        --exclude='\.\./src/.*\.vala$'
         --json --print-summary --output=../coverage-${CI_JOB_NAME}.json 2>/dev/null
     - popd
     - |
diff --git a/docs/reference/libtracker-sparql/meson.build b/docs/reference/libtracker-sparql/meson.build
index 759f188bf..72c03e352 100644
--- a/docs/reference/libtracker-sparql/meson.build
+++ b/docs/reference/libtracker-sparql/meson.build
@@ -61,7 +61,7 @@ docs_name = 'Tracker'
 hotdoc.generate_doc(docs_name,
   project_version: tracker_version,
   languages: [ 'c', 'python', 'javascript' ],
-  gi_c_sources: [libtracker_sparql_c_sources, libtracker_sparql_c_public_headers],
+  gi_c_sources: [libtracker_sparql_sources, libtracker_sparql_public_headers],
   gi_sources: [tracker_sparql_gir[0].full_path()],
   sitemap: 'sitemap.txt',
   index: 'index.md',
diff --git a/meson.build b/meson.build
index ebb9acca1..a34364b66 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('tracker', 'c', 'vala',
+project('tracker', 'c',
         version: '3.4.0.alpha',
         meson_version: '>=0.51',
         default_options: [
@@ -122,10 +122,6 @@ add_project_arguments('-DTRACKER_COMPILATION',
                       '-DG_LOG_DOMAIN="Tracker"',
                       '-DG_LOG_STRUCTURED=1',
                       language: 'c')
-add_project_arguments(['-D', 'TRACKER_COMPILATION'],
-                      ['-D', 'G_LOG_DOMAIN="Tracker"'],
-                      ['-D', 'G_LOG_STRUCTURED=1'],
-                      language: 'vala')
 
 if get_option('buildtype') == 'plain'
   # Default case is to allow TRACKER_DEBUG which is very useful for
diff --git a/src/libtracker-sparql/meson.build b/src/libtracker-sparql/meson.build
index 149dfd33d..a109e036a 100644
--- a/src/libtracker-sparql/meson.build
+++ b/src/libtracker-sparql/meson.build
@@ -19,9 +19,8 @@ enum_types = gnome.mkenums('tracker-sparql-enum-types',
 )
 
 tracker_sparql_vapi = files('tracker-sparql.vapi')
-tracker_sparql_vapi_dep = meson.get_compiler('vala').find_library('tracker-sparql', dirs: 
meson.current_source_dir())
 
-libtracker_sparql_c_sources = files(
+libtracker_sparql_sources = files(
     'tracker-batch.c',
     'tracker-connection.c',
     'tracker-cursor.c',
@@ -49,7 +48,7 @@ libtracker_sparql_c_sources = files(
     'tracker-version.c',
 )
 
-libtracker_sparql_c_public_headers = files(
+libtracker_sparql_public_headers = files(
     'tracker-batch.h',
     'tracker-connection.h',
     'tracker-cursor.h',
@@ -70,7 +69,7 @@ libtracker_sparql_c_public_headers = files(
 sparqlinc = [include_directories('.'), meson.current_build_dir()]
 
 install_headers(
-    libtracker_sparql_c_public_headers,
+    libtracker_sparql_public_headers,
     'tracker-ontologies.h',
     'tracker-sparql.h',
     version_header,
@@ -90,7 +89,6 @@ install_data(
 
 libtracker_sparql_dependencies = [
     tracker_common_dep,
-    tracker_sparql_vapi_dep,
     gmodule,
     libdl,
     json_glib,
@@ -100,7 +98,7 @@ libtracker_sparql_dependencies = [
 
 libtracker_sparql_private = static_library('tracker-sparql-private',
     enum_types,
-    libtracker_sparql_c_sources,
+    libtracker_sparql_sources,
     core_files,
     bus_files,
     direct_files,
@@ -114,14 +112,6 @@ libtracker_sparql_private = static_library('tracker-sparql-private',
         '-DBUILDROOT="@0@"'.format(meson.build_root()),
     ] + tracker_c_args,
 
-    vala_args: [
-        '--debug',
-        '--pkg', 'posix',
-        # FIXME: Meson has code to add --target-glib automatically, but it
-        # doesn't seem to work here.
-        '--target-glib', glib_required,
-    ],
-
     dependencies: [libtracker_sparql_dependencies],
     gnu_symbol_visibility: 'hidden',
 )
@@ -151,6 +141,7 @@ tracker_sparql_dep = declare_dependency(
     link_with: libtracker_sparql,
     include_directories: srcinc,
     dependencies: [glib, gio],
+    sources: enum_types[1],
 )
 
 pkg.generate(libtracker_sparql,
@@ -187,8 +178,8 @@ if get_option('introspection').enabled()
 
     tracker_sparql_gir = gnome.generate_gir(libtracker_sparql,
         sources: [
-            libtracker_sparql_c_sources,
-            libtracker_sparql_c_public_headers,
+            libtracker_sparql_sources,
+            libtracker_sparql_public_headers,
             introspection_extra_sources,
         ],
         dependencies: introspection_extra_deps,