[gnome-usage] meson: Drop the libhandy submodule
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-usage] meson: Drop the libhandy submodule
- Date: Wed, 15 Sep 2021 06:07:23 +0000 (UTC)
commit 544bd2a1302aaafa3926bf1eeb82551755c2a2ed
Author: Adrien Plazas <kekun plazas laposte net>
Date: Wed Sep 15 07:46:02 2021 +0200
meson: Drop the libhandy submodule
New enough versions of Libhandy are available everywhere now.
.gitmodules | 3 ---
meson.build | 26 --------------------------
subprojects/libhandy | 1 -
3 files changed, 30 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index e0fed8a..e69de29 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 2c04f74..b0967ca 100644
--- a/meson.build
+++ b/meson.build
@@ -18,29 +18,6 @@ libgtop_dep = dependency('libgtop-2.0', version : '>= 2.34.0')
libhandy_dep = dependency('libhandy-1', version : '>= 1.0.0', required: false)
tracker_dep = dependency('tracker-sparql-3.0')
-if not libhandy_dep.found()
- libhandy_subproj = subproject(
- 'libhandy',
- default_options: [
- 'examples=false',
- 'glade_catalog=disabled',
- 'tests=false',
- ]
- )
-
- # When using libhandy as subproject, make sure we get the VAPI file
- libhandy_dep = declare_dependency(
- dependencies: [
- libhandy_subproj.get_variable('libhandy_dep'),
- libhandy_subproj.get_variable('libhandy_vapi'),
- ]
- )
-
- libhandy_vapidir = join_paths(meson.build_root(), 'subprojects', 'libhandy', 'src')
-else
- libhandy_vapidir = ''
-endif
-
gnome = import('gnome')
i18n = import('i18n')
@@ -59,9 +36,6 @@ po_dir = join_paths(meson.source_root(), 'po')
vapi_dir = join_paths (meson.source_root (), 'vapi')
vapi_dirs = [ '--vapidir=@0@'.format(vapi_dir) ]
-if libhandy_vapidir != ''
- vapi_dirs += '--vapidir=@0@'.format(libhandy_vapidir)
-endif
if get_option('profile') == 'development'
profile = 'Devel'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]