[gnome-initial-setup: 2/3] Add meson wrap-git fallback for libhandy




commit 8d75091b41781bb25495068e2cc83a14441427ae
Author: Will Thompson <will willthompson co uk>
Date:   Fri Feb 18 20:53:45 2022 +0000

    Add meson wrap-git fallback for libhandy
    
    The version of libhandy in the fedora branch used for CI is 1.5.0, but
    1.5.90.
    
    Add a wrap as a fallback for the time being.

 .gitignore                      | 1 +
 .gitlab-ci.yml                  | 7 +++++++
 gnome-initial-setup/meson.build | 2 +-
 subprojects/libhandy.wrap       | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index 6a4d5d23..d0a2dde0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /_build-*
 /subprojects/gnome-desktop
 /subprojects/libgweather
+/subprojects/libhandy
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28edc05f..02e5aaea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,13 @@ stages:
       -Dlibgweather:gtk_doc=false
       -Dlibgweather:introspection=false
       -Dlibgweather:tests=false
+      -Dlibhandy:examples=false
+      -Dlibhandy:glade_catalog=disabled
+      -Dlibhandy:gtk_doc=false
+      -Dlibhandy:introspection=disabled
+      -Dlibhandy:profiling=false
+      -Dlibhandy:tests=false
+      -Dlibhandy:vapi=false
       ${EXTRA_PARAMETERS}
       _build .
     - cd _build
diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
index 82b1e456..4ee9ff39 100644
--- a/gnome-initial-setup/meson.build
+++ b/gnome-initial-setup/meson.build
@@ -44,7 +44,7 @@ dependencies = [
     dependency ('gdm', version: '>= 3.8.3'),
     dependency ('geocode-glib-1.0'),
     dependency ('libgeoclue-2.0', version: '>= 2.3.1'),
-    dependency ('libhandy-1', version: '>= 1.5.90'),
+    dependency ('libhandy-1', version: '>= 1.5.90', fallback: ['libhandy', 'libhandy_dep']),
     cc.find_library('m', required: false),
     dependency ('pango', version: '>= 1.32.5'),
     dependency ('rest-0.7'),
diff --git a/subprojects/libhandy.wrap b/subprojects/libhandy.wrap
new file mode 100644
index 00000000..4b5b372b
--- /dev/null
+++ b/subprojects/libhandy.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://gitlab.gnome.org/GNOME/libhandy.git
+revision = main


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