Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson.build: allow linux to build without flatpak installed #1100

Merged
merged 2 commits into from
Oct 9, 2023
Merged

meson.build: allow linux to build without flatpak installed #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdcb10f
meson.build: allow linux to build without flatpak installed
navi-desu Sep 8, 2023
b204833
meson.build: allow flag to build without bubblewrap
navi-desu Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ endif

flatpak_intf_dir = get_option('flatpak-interfaces-dir')
if flatpak_intf_dir == ''
flatpak_required = host_machine.system() in ['linux']
flatpak_dep = dependency('flatpak', version: '>= 1.5.0', required : flatpak_required)
flatpak_dep = dependency('flatpak', version: '>= 1.5.0', required: get_option('flatpak-interfaces'))
if flatpak_dep.found()
flatpak_intf_dir = flatpak_dep.get_variable(pkgconfig: 'interfaces_dir')
endif
Expand Down Expand Up @@ -113,8 +112,19 @@ libportal_dep = dependency('libportal',
pipewire_dep = dependency('libpipewire-0.3', version: '>= 0.2.90')
libsystemd_dep = dependency('libsystemd', required: get_option('systemd'))

bwrap_required = host_machine.system() in ['linux']
bwrap = find_program('bwrap', required: bwrap_required)

use_bwrap = get_option('sandboxed-image-validation')
bwrap = find_program('bwrap', required: use_bwrap)

if not use_bwrap
warning('''
Sandboxed image validation with Bubblewrap is DISABLED.
If your system can run Bubblewrap, it's **hightly** recommended that you enable this
option. Bitmap validation and processing is a common attack vector.
By proceeding with sandboxed image validation disabled, you acknowledge that you
are lowering your system's security, and are subject to known or unknown exploits.
''')
endif

have_libportal = libportal_dep.found()
if have_libportal
Expand Down Expand Up @@ -190,6 +200,8 @@ summary({
'Enable installed tests:': enable_installed_tests,
'Enable python test suite': enable_pytest,
'Build man pages': rst2man.found(),
'Build flatpak interfaces': flatpak_dep.found(),
'Sandboxed image validation': use_bwrap,
},
section: 'Optional builds',
bool_yn: true,
Expand Down
8 changes: 8 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ option('dbus-service-dir',
type: 'string',
value: '',
description: 'directory for dbus service files (default: PREFIX/share/dbus-1/services)')
option('flatpak-interfaces',
type: 'feature',
value: 'auto',
description: 'Build flatpak interfaces')
option('flatpak-interfaces-dir',
type: 'string',
value: '',
Expand Down Expand Up @@ -46,3 +50,7 @@ option('man-pages',
type: 'feature',
value: 'auto',
description: 'Build man pages (requires rst2man)')
option('sandboxed-image-validation',
type: 'boolean',
value: true,
description: 'Use Bubblewrap to sandbox image validation. Disabling this option may lead to security vulnerabilities.')
Loading