[seahorse/wip/nielsdg/handy: 1/2] Remove libhandy as a submodule




commit d77b1295da7b2dc42a647ad9c446366c3de4bd05
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Mon Feb 15 16:16:17 2021 +0100

    Remove libhandy as a submodule

 .gitmodules          |  3 ---
 meson.build          | 21 +--------------------
 subprojects/libhandy |  1 -
 3 files changed, 1 insertion(+), 24 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index e0fed8ac..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "subprojects/libhandy"]
-       path = subprojects/libhandy
-       url = https://gitlab.gnome.org/GNOME/libhandy.git
diff --git a/meson.build b/meson.build
index 1c9885bd..63b0ceaa 100644
--- a/meson.build
+++ b/meson.build
@@ -37,26 +37,7 @@ glib_deps = [
   dependency('gmodule-2.0', version: '>=' + min_glib_version),
 ]
 gtk = dependency('gtk+-3.0', version: '>= 3.22.0')
-libhandy_dep = dependency('libhandy-1', version: '>= 1.0.0', required: false)
-if not libhandy_dep.found()
-  libhandy_subproj = subproject(
-    'libhandy',
-    default_options: [
-      'examples=false',
-      'glade_catalog=disabled',
-      'tests=false',
-      'vapi=true',
-    ]
-  )
-
-  # Make sure to also get the VAPI file
-  libhandy_dep = declare_dependency(
-    dependencies: [
-      libhandy_subproj.get_variable('libhandy_dep'),
-      libhandy_subproj.get_variable('libhandy_vapi'),
-    ]
-  )
-endif
+libhandy_dep = dependency('libhandy-1', version: '>= 1.0.0')
 gcr = dependency('gcr-3',       version: '>=' + min_gcr_version)
 gcr_ui = dependency('gcr-ui-3', version: '>=' + min_gcr_version)
 libsecret = dependency('libsecret-1', version: '>= 0.16')


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