[console/zbrown/process] ci: v2

[Zander Brown <zbrown src gnome org>]

commit a42c3650cdc16849fba0e919574a4f16d72a51bb
Author: Zander Brown <zbrown gnome org>
Date:   Sun Jun 26 20:26:46 2022 +0100

    ci: v2

 .editorconfig          | 8 +++++++-
 .gitignore             | 6 ++++--
 .gitlab-ci.yml         | 2 --
 src/meson.build        | 4 ++--
 src/styles/meson.build | 6 +-----
 subprojects/glib.wrap  | 8 ++++++++
 subprojects/handy.wrap | 3 +++
 subprojects/sassc.wrap | 3 +++
 subprojects/vte.wrap   | 3 +++
 9 files changed, 31 insertions(+), 12 deletions(-)
---
diff --git a/.editorconfig b/.editorconfig
index 3bc0d4a..47e8f19 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,9 @@
+root = true
+
 [*.{c,h}]
 indent_size = 2
-indent_style = space
\ No newline at end of file
+indent_style = space
+trim_trailing_whitespace = true
+
+[meson.build]
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
index af3e38e..d5f2082 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,7 @@
 *~
 build
 .vscode
-/subprojects/vte
-/subprojects/handy
\ No newline at end of file
+/subprojects/glib
+/subprojects/gtk
+/subprojects/handy
+/subprojects/vte
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bf8bf4..20395e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,8 +43,6 @@ freebsd-13-x86_64:
     CPPFLAGS: -I/usr/local/include
     LDFLAGS: -L/usr/local/lib -Wl,--disable-new-dtags
     LANG: C.UTF-8
-  before_script:
-    - pkg install gtk3 libgtop
   script:
     - meson --buildtype=release -Dtests=true _build .
     - meson compile -C _build
diff --git a/src/meson.build b/src/meson.build
index 83c1107..fcf7192 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -36,8 +36,8 @@ kgx_sources = [
 kgx_deps = [
   dependency('gio-2.0', version: '>= 2.66'),
   dependency('gtk+-3.0', version: '>= 3.24'),
-  dependency('libhandy-1', version: '>= 1.5', fallback: ['handy', 'libhandy_dep']),
-  dependency('vte-2.91', version: '>= 0.67', fallback: ['vte', 'libvte_gtk3_dep']),
+  dependency('libhandy-1', version: '>= 1.5'),
+  dependency('vte-2.91', version: '>= 0.67'),
   dependency('libgtop-2.0'),
   dependency('gsettings-desktop-schemas'),
   cc.find_library('m', required: false),
diff --git a/src/styles/meson.build b/src/styles/meson.build
index 0b3fab6..829b2db 100644
--- a/src/styles/meson.build
+++ b/src/styles/meson.build
@@ -1,8 +1,4 @@
-sassc = find_program('sassc', required: false)
-if not sassc.found() and not get_option('sassc').disabled()
-  subproject('sassc')
-  sassc = find_program('sassc', required: get_option('sassc').enabled())
-endif
+sassc = find_program('sassc', required: get_option('sassc'))
 
 if sassc.found()
   styles = [
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
new file mode 100644
index 0000000..bb1dd22
--- /dev/null
+++ b/subprojects/glib.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+directory=glib
+url=https://gitlab.gnome.org/GNOME/glib
+revision=origin/main
+
+[provide]
+dependency_names=glib-2.0,gobject-2.0,gio-2.0
+program_names=glib-compile-schemas
diff --git a/subprojects/handy.wrap b/subprojects/handy.wrap
index 67800df..aaa9ec1 100644
--- a/subprojects/handy.wrap
+++ b/subprojects/handy.wrap
@@ -2,3 +2,6 @@
 directory=handy
 url=https://gitlab.gnome.org/GNOME/libhandy.git
 revision=origin/main
+
+[provide]
+dependency_names=libhandy-1
diff --git a/subprojects/sassc.wrap b/subprojects/sassc.wrap
index edd76c6..9385d8b 100644
--- a/subprojects/sassc.wrap
+++ b/subprojects/sassc.wrap
@@ -3,3 +3,6 @@ directory=sassc
 url=https://github.com/lazka/sassc.git
 revision=meson
 depth=1
+
+[provide]
+program_names=sassc
diff --git a/subprojects/vte.wrap b/subprojects/vte.wrap
index 13ed2e8..b66d80a 100644
--- a/subprojects/vte.wrap
+++ b/subprojects/vte.wrap
@@ -2,3 +2,6 @@
 directory=vte
 url=https://gitlab.gnome.org/GNOME/vte
 revision=origin/master
+
+[provide]
+dependency_names=vte-2.91