[gnome-disk-utility/wip/christopherdavis/use-libhandy: 3/4] build: Add libhandy as a subproject




commit ea3c3931ca6a7db9332f928a6a73d9877746fdb1
Author: Christopher Davis <brainblasted disroot org>
Date:   Wed Sep 16 20:52:35 2020 -0700

    build: Add libhandy as a subproject
    
    Allows for building Disks on distros that don't ship libhandy
    as a dependency.

 .gitignore                | 1 +
 meson.build               | 2 +-
 subprojects/libhandy.wrap | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..456ecd02
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/subprojects/libhandy/
diff --git a/meson.build b/meson.build
index 082fcd3a..eee1d9c7 100644
--- a/meson.build
+++ b/meson.build
@@ -73,7 +73,7 @@ gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.31.0')
 gmodule_dep = dependency('gmodule-2.0')
 gtk_dep = dependency('gtk+-3.0', version: '>= 3.16.0')
 libcanberra_dep = dependency('libcanberra-gtk3', version: '>= 0.1')
-libhandy_dep = dependency('libhandy-1', version: '>= 1.0.0')
+libhandy_dep = dependency('libhandy-1', version: '>= 1.0.0', fallback: ['libhandy', 'libhandy_dep'])
 liblzma_dep = dependency('liblzma', version: '>= 5.0.5')
 libnotify_dep = dependency('libnotify', version: '>= 0.7')
 libsecret_dep = dependency('libsecret-1', version: '>= 0.7')
diff --git a/subprojects/libhandy.wrap b/subprojects/libhandy.wrap
new file mode 100644
index 00000000..a3806c8d
--- /dev/null
+++ b/subprojects/libhandy.wrap
@@ -0,0 +1,4 @@
+[wrap-git]
+directory=libhandy
+url=https://gitlab.gnome.org/GNOME/libhandy.git
+revision=origin/master


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