dependencies: Add libhandy as a subproject

Allows for building on systems that don't ship libhandy
or a version of libhandy that's new enough.
This commit is contained in:
Christopher Davis 2021-02-08 17:26:36 -08:00 committed by Georges Basile Stavracas Neto
parent 554b390cd4
commit d11e609543
4 changed files with 7 additions and 2 deletions

View File

@ -29,7 +29,7 @@ libmalcontent_ui_public_deps = [
dependency('glib-2.0', version: '>= 2.54.2'), dependency('glib-2.0', version: '>= 2.54.2'),
dependency('gobject-2.0', version: '>= 2.54'), dependency('gobject-2.0', version: '>= 2.54'),
dependency('gtk+-3.0', version: '>= 3.24'), dependency('gtk+-3.0', version: '>= 3.24'),
dependency('libhandy-1', version: '>= 1.1.0'), libhandy_dep,
libmalcontent_dep, libmalcontent_dep,
] ]
libmalcontent_ui_private_deps = [ libmalcontent_ui_private_deps = [

View File

@ -28,8 +28,8 @@ malcontent_control = executable('malcontent-control',
dependency('glib-2.0', version: '>= 2.54.2'), dependency('glib-2.0', version: '>= 2.54.2'),
dependency('gobject-2.0', version: '>= 2.54'), dependency('gobject-2.0', version: '>= 2.54'),
dependency('gtk+-3.0'), dependency('gtk+-3.0'),
dependency('libhandy-1', version: '>=1.1.0'),
dependency('polkit-gobject-1'), dependency('polkit-gobject-1'),
libhandy_dep,
libmalcontent_dep, libmalcontent_dep,
libmalcontent_ui_dep, libmalcontent_ui_dep,
], ],

View File

@ -134,6 +134,7 @@ else
'Malcontent-' + libmalcontent_api_version + '.typelib'] 'Malcontent-' + libmalcontent_api_version + '.typelib']
endif endif
if get_option('ui').enabled() if get_option('ui').enabled()
libhandy_dep = dependency('libhandy-1', version: '>=1.1.0', fallback: ['libhandy', 'libhandy_dep'])
subdir('libmalcontent-ui') subdir('libmalcontent-ui')
endif endif
subdir('malcontent-client') subdir('malcontent-client')

View File

@ -0,0 +1,4 @@
[wrap-git]
directory = libhandy
url = https://gitlab.gnome.org/GNOME/libhandy.git
revision = origin/main