nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Remove libhandy submodule from the build

Browse source 
Although libhandy-1 is not widely available yet, Damned-Lies is having
trouble dealing with the submodule and it's more important to get
translations done than this build convenience, so pull it out.

See Infrastructure/damned-lies#184
This commit is contained in:
Michael Gratton 2020-08-27 08:30:15 +10:00 • committed by Michael James Gratton
parent 697d60ebb8
commit f9df7dddf5
4 changed files with 7 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -1,4 +0,0 @@
[submodule "subprojects/libhandy"]
path = subprojects/libhandy
url = https://gitlab.gnome.org/GNOME/libhandy.git
branch = master

22
meson.build
View file

@ -85,7 +85,7 @@ gthread = dependency('gthread-2.0', version: '>=' + target_glib)
iso_codes = dependency('iso-codes') iso_codes = dependency('iso-codes')
javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit) javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
json_glib = dependency('json-glib-1.0', version: '>= 1.0') json_glib = dependency('json-glib-1.0', version: '>= 1.0')
libhandy = dependency('libhandy-1', version: '>= 0.90', required: false) libhandy = dependency('libhandy-1', version: '>= 0.90')
libmath = cc.find_library('m') libmath = cc.find_library('m')
libpeas = dependency('libpeas-1.0', version: '>= 1.24.0') libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0') libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0')
@ -117,26 +117,6 @@ if libunwind_dep.found()
) )
endif endif
# Handy 1.0 is still rather new
libhandy_vapi = ''
if not libhandy.found()
libhandy_project = subproject(
'libhandy',
default_options: [
'examples=false',
'package_subdir=geary',
'tests=false',
]
)
libhandy = declare_dependency(
dependencies: [
libhandy_project.get_variable('libhandy_dep'),
libhandy_project.get_variable('libhandy_vapi')
]
)
libhandy_vapi = meson.build_root() / 'subprojects' / 'libhandy' / 'src'
endif
# Optional dependencies # Optional dependencies
appstream_util = find_program('appstream-util', required: false) appstream_util = find_program('appstream-util', required: false)
desktop_file_validate = find_program('desktop-file-validate', required: false) desktop_file_validate = find_program('desktop-file-validate', required: false)

19
src/meson.build
View file

@ -136,6 +136,11 @@ valadoc_dependencies = [
webkit2gtk webkit2gtk
] ]
valadoc_vapi_dirs = [
vapi_dir,
meson.current_build_dir()
]
# Hopefully Meson will get baked-in valadoc support, so we don't have # Hopefully Meson will get baked-in valadoc support, so we don't have
# to resort to these kinds of hacks any more. See # to resort to these kinds of hacks any more. See
# https://github.com/mesonbuild/meson/issues/894 # https://github.com/mesonbuild/meson/issues/894
@ -143,22 +148,10 @@ valadoc_dependencies = [
valadoc_dep_args = [] valadoc_dep_args = []
foreach dep : valadoc_dependencies foreach dep : valadoc_dependencies
valadoc_dep_args += '--pkg' valadoc_dep_args += '--pkg'
if dep != libhandy valadoc_dep_args += dep.name()
valadoc_dep_args += dep.name()
else
valadoc_dep_args += 'libhandy-1'
endif
endforeach endforeach
valadoc_dep_args += [ '--pkg', 'posix' ] valadoc_dep_args += [ '--pkg', 'posix' ]
valadoc_vapi_dirs = [
vapi_dir,
meson.current_build_dir()
]
if libhandy_vapi != ''
valadoc_vapi_dirs += libhandy_vapi
endif
valadoc_vapidir_args = [] valadoc_vapidir_args = []
foreach dir : valadoc_vapi_dirs foreach dir : valadoc_vapi_dirs
valadoc_vapidir_args += '--vapidir=@0@'.format(dir) valadoc_vapidir_args += '--vapidir=@0@'.format(dir)

1
subprojects/libhandy

@ -1 +0,0 @@
Subproject commit d22356ef5f0cc6c6080896ae5611677d59849f51