mirrors/Authenticator
1
0
Fork 0
mirror of https://gitlab.gnome.org/World/Authenticator.git synced 2025-03-04 08:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: fix dependencies & serach provider build

Browse source
This commit is contained in:
Bilal Elmoussaoui 2019-01-01 17:00:34 +01:00
parent 9187d4529b
commit 28296876b9
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Authenticator/models/keyring.py
View file

@ -43,6 +43,7 @@ class Keyring:
@staticmethod
def get_default():
if Keyring.instance is None:
Secret.Service.unlock_sync()
Keyring.instance = Keyring()
return Keyring.instance

3
data/meson.build
View file

@ -26,6 +26,7 @@ configure_file(
search_service_provider_conf = configuration_data()
search_service_provider_conf.set('appid', application_id)
search_service_provider_conf.set('profile', profile)
search_service_provider_conf.set('libexecdir', LIBEXEC_DIR)
configure_file(
configuration: search_service_provider_conf,
input: files(meson.project_name() + '.SearchProvider.service.in'),
@ -85,7 +86,7 @@ appdata_file = i18n.merge_file(
install_dir: join_paths(get_option('datadir'), 'metainfo')
)
# Validate AppData File
appstreamcli = find_program('appstream-util', required:false)
appstreamcli = find_program('appstream-util', required: false)
if appstreamcli.found()
test (
'Validate appdata file',

12
meson.build
View file

@ -1,4 +1,4 @@
project('com.github.bilelmoussaoui.Authenticator',
project('com.github.bilelmoussaoui.Authenticator', 'c',
version: '3.31',
meson_version: '>= 0.48',
license: 'GPL+-3.0',
@ -23,6 +23,12 @@ dependency('glib-2.0')
dependency('gobject-2.0')
dependency('gobject-introspection-1.0')
dependency('gtk+-3.0', version: '>=3.16')
dependency('libsecret-1')
dependency('zbar', version: '>= 0.20.1')
find_program('glib-compile-schemas', required: true)
find_program('gtk-update-icon-cache', required: false)
find_program('update-desktop-database', required: false)
python3 = python.find_python()
if not python3.found()
@ -34,7 +40,7 @@ endif
LIB_DIR = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name())
LOCALE_DIR = join_paths(get_option('prefix'), get_option('localedir'))
DATA_DIR = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
LIBEXEC_DIR = join_paths(get_option('prefix'), get_option('libexecdir'))
libgd_dep = dependency('gdlib', required: false)
if not libgd_dep.found()
libgd_proj = subproject('libgd',
@ -59,7 +65,7 @@ conf.set('VERSION', meson.project_version())
conf.set('LIB_DIR', LIB_DIR)
conf.set('PROFILE', profile)
conf.set('NAME_SUFFIX', name_suffix)
conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir')))
conf.set('libexecdir', LIBEXEC_DIR)
conf.set('PYTHON', python3.path())
subdir('data')