[gnome-contacts/wip/nielsdg/remove-handy-subproject] Remove libhandy git submodule / meson subproject
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-contacts/wip/nielsdg/remove-handy-subproject] Remove libhandy git submodule / meson subproject
- Date: Fri, 4 Dec 2020 10:38:09 +0000 (UTC)
commit 07c4a336a0fbc8860c8164385d4732a9e4c82b0a
Author: Niels De Graef <nielsdegraef gmail com>
Date: Fri Dec 4 11:36:36 2020 +0100
Remove libhandy git submodule / meson subproject
libhandy has reached a stable point, so distributions should start
including it as a proper package rather than relying on a git submodule.
This also fixes some small annoyances in the build system.
.gitmodules | 3 ---
docs/meson.build | 4 ----
meson.build | 31 +++----------------------------
subprojects/libhandy | 1 -
4 files changed, 3 insertions(+), 36 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/docs/meson.build b/docs/meson.build
index 471673ce..8ec997d9 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -2,10 +2,6 @@ docs_vapidirs = [
'--vapidir=@0@'.format(meson.source_root() / 'vapi'),
]
-if libhandy_vapidir != ''
- docs_vapidirs += '--vapidir=@0@'.format(libhandy_vapidir )
-endif
-
custom_target('docs',
input: contacts_vala_sources,
output: 'docs',
diff --git a/meson.build b/meson.build
index 7eaeed89..eb4da234 100644
--- a/meson.build
+++ b/meson.build
@@ -10,9 +10,6 @@ i18n = import('i18n')
# Add our custom VAPI dir
add_project_arguments(
['--vapidir', meson.source_root() / 'vapi'],
- # We need to add this, since Vala queries the pkgconfig version on its own
- # and will error out if that is lower then required one
- '--disable-since-check',
language: 'vala'
)
@@ -53,10 +50,12 @@ gmodule_export = dependency('gmodule-export-2.0', version: '>=' + min_glib_versi
gnome_desktop = dependency('gnome-desktop-3.0')
goa = dependency('goa-1.0')
gtk = dependency('gtk+-3.0', version: '>= 3.23.1')
+libhandy = dependency('libhandy-1', version: '>= 1.0.0')
+# E-D-S
libebook = dependency('libebook-1.2', version: '>=' + min_eds_version)
libedataserver = dependency('libedataserver-1.2', version: '>=' + min_eds_version)
libedataserverui = dependency('libedataserverui-1.2', version: '>=' + min_eds_version)
-
+# Cheese
cheese_dep = dependency('cheese', required: get_option('cheese'))
cheese_gtk_dep = dependency('cheese-gtk', version: '>= 3.3.91', required: get_option('cheese'))
@@ -65,30 +64,6 @@ if get_option('telepathy')
telepathy_glib = dependency('telepathy-glib', version: '>= 0.22.0')
endif
-libhandy = dependency('libhandy-1', version: '>= 1.0.0', required: false)
-if not libhandy.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 = declare_dependency(
- dependencies: [
- libhandy_subproj.get_variable('libhandy_dep'),
- libhandy_subproj.get_variable('libhandy_vapi'),
- ]
- )
-
- libhandy_vapidir = meson.build_root() / 'subprojects' / 'libhandy' / 'src'
-else
- libhandy_vapidir = ''
-endif
-
valadoc = find_program('valadoc', required: get_option('docs'))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]