Depend on locksmith-1, drop vendored libsodium vapi

dependency('locksmith-1') replaces the bundled vapi + -lsodium everywhere it was used (library, statum-genkeys). The --vapidir project argument is gone along with vapi/libsodium.vapi; nothing else lived in vapi/. statum_dep now carries locksmith_dep so consumers of the generated statum-0.1.vapi (whose with_keys now names Locksmith.Error) compile and link without changes. MANIFEST.usm swaps lib:libsodium.so.26/pc:libsodium.pc for lib:liblocksmith-1.so.0/pc:locksmith-1.pc.

MANIFEST.usm

@@ -25,7 +25,7 @@
       "lib:libinvercargill-json.so",
       "lib:libinversion-0.1.so",
       "lib:libastralis-0.1.so",
-      "lib:libsodium.so.26",
+      "lib:liblocksmith-1.so.0",
       "lib:libxml2.so.2"
     ],
     "build" : [
@@ -41,7 +41,7 @@
       "pc:json-glib-1.0.pc",
       "pc:libxml-2.0.pc",
       "pc:sqlite3.pc",
-      "pc:libsodium.pc",
+      "pc:locksmith-1.pc",
       "pc:invercargill-1.pc",
       "pc:invercargill-json.pc",
       "pc:inversion-0.1.pc",

meson.build

@@ -2,8 +2,6 @@ project('statum', ['c', 'vala'],
   version: '0.2.0',
 )
 
-vapi_dir = join_paths(meson.current_source_dir(), 'vapi')
-
 # Dependencies
 glib_dep = dependency('glib-2.0')
 gobject_dep = dependency('gobject-2.0')
@@ -18,14 +16,7 @@ invercargill_json_dep = dependency('invercargill-json')
 invercargill_sql_dep = dependency('invercargill-sql', required: true)
 invercargill_sql_inversion_dep = dependency('invercargill-sql-inversion', required: true)
 sqlite_dep = dependency('sqlite3')
-
-# libsodium is consumed via a bundled VAPI (libsodium does not ship one).
-sodium_vapi = files('vapi/libsodium.vapi')
-sodium_c_lib = meson.get_compiler('c').find_library('sodium', required: true)
-sodium_deps = declare_dependency(sources: sodium_vapi, dependencies: sodium_c_lib)
-
-# VAPI Directory
-add_project_arguments(['--vapidir', vapi_dir], language: 'vala')
+locksmith_dep = dependency('locksmith-1')
 
 # Tools are built first (from source — never required to be installed) so the
 # library can use them at its own build time (e.g. to embed the client scripts).

src/meson.build

@@ -82,7 +82,7 @@ libstatum = shared_library('statum-@0@'.format(api_version),
         libxml_dep,
         inversion_dep,
         astralis_dep,
-        sodium_deps,
+        locksmith_dep,
         invercargill_sql_dep,
         sqlite_dep,
         invercargill_sql_inversion_dep,
@@ -111,5 +111,6 @@ statum_dep = declare_dependency(
         libxml_dep,
         inversion_dep,
         astralis_dep,
+        locksmith_dep,
     ]
 )

tools/statum-genkeys/meson.build

@@ -4,6 +4,6 @@ statum_genkeys_sources = files(
 
 executable('statum-genkeys',
     statum_genkeys_sources,
-    dependencies: [glib_dep, gobject_dep, dependency('gio-2.0'), sodium_deps],
+    dependencies: [glib_dep, gobject_dep, dependency('gio-2.0'), locksmith_dep],
     install: true
 )