From 28296876b919b4be4a3a8287a3837c1229b9962d Mon Sep 17 00:00:00 2001
From: Bilal Elmoussaoui <bil.elmoussaoui@gmail.com>
Date: Tue, 1 Jan 2019 17:00:34 +0100
Subject: [PATCH] meson: fix dependencies & serach provider build

---
 Authenticator/models/keyring.py |  1 +
 data/meson.build                |  3 ++-
 meson.build                     | 12 +++++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Authenticator/models/keyring.py b/Authenticator/models/keyring.py
index 8dcd58d..5b5db4c 100644
--- a/Authenticator/models/keyring.py
+++ b/Authenticator/models/keyring.py
@@ -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
 
diff --git a/data/meson.build b/data/meson.build
index 6399939..182c1d2 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -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',
diff --git a/meson.build b/meson.build
index 74c3e28..ed72e60 100644
--- a/meson.build
+++ b/meson.build
@@ -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')