[gnome-system-monitor/wip/cdavis/dark-style-preference] build: Use libhandy subproject as a fallback




commit 7cb571fa0f6415ed47e493a29f83e1e98e2d264c
Author: Christopher Davis <christopherdavis gnome org>
Date:   Sat Dec 11 13:36:14 2021 -0800

    build: Use libhandy subproject as a fallback

 .gitlab-ci.yml            | 2 +-
 meson.build               | 9 +++++++--
 subprojects/libhandy.wrap | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d317fa9..d564829e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
     glibmm24-devel
     gtkmm30-devel
     itstool
-    libhandy1-devel
+    #libhandy1-devel
     librsvg2-devel
     libxml2-devel
     meson
diff --git a/meson.build b/meson.build
index 8447800a..4c5e7b4c 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,12 @@
 project('gnome-system-monitor',
   'c', 'cpp',
   default_options : [
-    'c_std=c11', 'cpp_std=c++11', 'warning_level=3'
+    'c_std=c11',
+    'cpp_std=c++11',
+    'warning_level=3',
+    'libhandy:vapi=false',
+    'libhandy:introspection=disabled',
+    'libhandy:tests=false',
   ],
   version: '41.0',
   meson_version: '>=0.50.0',
@@ -48,7 +53,7 @@ gtk3    = dependency('gtk+-3.0',    version: '>=3.22.0')
 gtkmm   = dependency('gtkmm-3.0',   version: '>=3.3.18')
 atkmm   = dependency('atkmm-1.6',   version: '>=2.28')
 libgtop = dependency('libgtop-2.0', version: '>=2.37.0')
-libhandy = dependency('libhandy-1',  version: '>=1.5.0')
+libhandy = dependency('libhandy-1', version: '>= 1.5.0', fallback: ['libhandy', 'libhandy_dep'])
 librsvg = dependency('librsvg-2.0', version: '>=2.35')
 libxml  = dependency('libxml-2.0',  version: '>=2.0')
 
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]