From e4d368736a5869470d05641aeee2266e641e01c0 Mon Sep 17 00:00:00 2001 From: Greg V Date: Wed, 9 Jan 2019 12:29:34 +0300 Subject: [PATCH 1/3] Use sqlite dependency when checking FTS On FreeBSD, checking sqlite.h without the dependency would look at /usr/include/sqlite.h (base system version) instead of /usr/local/include/sqlite.h (ports version, which has FTS and everything). --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index d18d3983..95bf584b 100644 --- a/meson.build +++ b/meson.build @@ -92,7 +92,7 @@ libunity = dependency('unity', version: '>= 5.12.0', required: false) libmessagingmenu = meson.get_compiler('c').find_library('libmessaging-menu', required: false) # Ensure SQLite was built correctly -if not cc.has_header_symbol('sqlite3.h', 'SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER') +if not cc.has_header_symbol('sqlite3.h', 'SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER', dependencies: sqlite) error('SQLite3 is missing FTS3 tokenizer support. Please compile it with -DSQLITE_ENABLE_FTS3.\n' + 'See https://bugzilla.gnome.org/show_bug.cgi?id=763203 for details.') endif From f09e5d7c6d696b184cefa52871fb9fac381e2447 Mon Sep 17 00:00:00 2001 From: Greg V Date: Wed, 9 Jan 2019 12:30:49 +0300 Subject: [PATCH 2/3] Use backup extension when calling sed -i BSD sed doesn't support -i without the backup extension. --- src/engine/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/meson.build b/src/engine/meson.build index 796e18d1..de98f4f7 100644 --- a/src/engine/meson.build +++ b/src/engine/meson.build @@ -372,7 +372,7 @@ geary_engine_internal_header_fixup = custom_target( ], command: [ find_program('sed'), - '-i', + '-ibak', 's/geary-engine.h/geary-engine-internal.h/g', '@OUTDIR@/geary-engine-internal.vapi', ], From b8ae8865ea1599600d4573fa7d020ef8178fe8eb Mon Sep 17 00:00:00 2001 From: Greg V Date: Wed, 9 Jan 2019 12:50:13 +0300 Subject: [PATCH 3/3] Fix meson targets for contractor contract --- desktop/meson.build | 2 +- meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/desktop/meson.build b/desktop/meson.build index e051cdc9..29f9ce74 100644 --- a/desktop/meson.build +++ b/desktop/meson.build @@ -25,7 +25,7 @@ if install_contractor_file # Description field. See merge req !50. msgfmt = find_program('msgfmt') - custom_target( + custom_target('geary-attach-contract', input: 'geary-attach.contract.desktop.in', output: 'geary-attach.contract', command: [msgfmt, '--desktop', '--keyword=Description', '--template', '@INPUT@', '-d', po_dir, '-o', '@OUTPUT@'], diff --git a/meson.build b/meson.build index 95bf584b..85e50c5b 100644 --- a/meson.build +++ b/meson.build @@ -20,6 +20,7 @@ cc = meson.get_compiler('c') valac = meson.get_compiler('vala') config_h_dir = include_directories('.') geary_prefix = get_option('prefix') +bindir = join_paths(geary_prefix, get_option('bindir')) datadir = join_paths(geary_prefix, get_option('datadir')) libdir = join_paths(geary_prefix, get_option('libdir')) locale_dir = join_paths(geary_prefix, get_option('localedir'))