[gnome-boxes/drop-libhandy-submodule] Drop libhandy as a subproject/submodule
- From: Felipe Borges <felipeborges src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes/drop-libhandy-submodule] Drop libhandy as a subproject/submodule
- Date: Fri, 24 Sep 2021 09:46:55 +0000 (UTC)
commit ae4abddcea95fe34ac00860545b4fa8e329907c7
Author: Felipe Borges <felipeborges gnome org>
Date: Fri Sep 24 11:41:37 2021 +0200
Drop libhandy as a subproject/submodule
At this point libhandy is available in most of the popular and
enterprise distros.
Fixes #725
.gitmodules | 4 ----
src/meson.build | 17 +----------------
subprojects/libhandy | 1 -
subprojects/libhandy.wrap | 4 ----
4 files changed, 1 insertion(+), 25 deletions(-)
---
diff --git a/.gitmodules b/.gitmodules
index 7744bc3a..524c0083 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,7 +5,3 @@
[submodule "subprojects/libovf-glib"]
path = subprojects/libovf-glib
url = https://gitlab.gnome.org/felipeborges/libovf-glib.git
-
-[submodule "subprojects/libhandy"]
- path = subprojects/libhandy
- url = https://gitlab.gnome.org/GNOME/libhandy.git
diff --git a/src/meson.build b/src/meson.build
index 5f546576..30935996 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -125,6 +125,7 @@ dependencies = [
dependency ('gtk-vnc-2.0', version: '>= 0.4.4'),
dependency ('gvncpulse-1.0'),
dependency ('gtksourceview-4'),
+ dependency ('libhandy-1', version: '>= 1.0.0'),
dependency ('libosinfo-1.0', version: '>= 1.7.0'),
dependency ('libsecret-1'),
dependency ('libsoup-2.4', version: '>= 2.38'),
@@ -155,22 +156,6 @@ if spice.found ()
]
endif
-libhandy = dependency ('libhandy-1', version: '>= 1.0.0', required: false)
-if not libhandy.found()
- libhandy = subproject(
- 'libhandy',
- default_options: [
- 'package_subdir=' + meson.project_name(),
- 'examples=false',
- 'glade_catalog=disabled',
- 'tests=false',
- ]
- )
- dependencies += libhandy.get_variable('libhandy_vapi')
-else
- dependencies += libhandy
-endif
-
if get_option('rdp')
vala_sources += ['rdp-display.vala']
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]