From ef7b83a5d668e4e5fd140eca228cb0646f1a7d1d Mon Sep 17 00:00:00 2001 From: Phaedrus Leeds Date: Fri, 20 May 2022 11:18:02 -0400 Subject: [PATCH] build: Enable webapps by default Enable webapps support and default webapps at compile time by default, as discussed in a call with several stakeholders. This will make it more likely that distributions will make use of the feature. --- .gitlab-ci.yml | 2 +- meson_options.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 65d9f2ab8..937cc343f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ cache: variables: MESON_TEST_TIMEOUT_MULTIPLIER: 4 G_MESSAGES_DEBUG: all - MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --prefix /usr -Dsoup2=true -Dwebapps=true" + MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --prefix /usr -Dsoup2=true -Dwebapps=true -Dhardcoded_foss_webapps=false -Dhardcoded_proprietary_webapps=false" BUNDLE: "gnome-software-dev.flatpak" .build: diff --git a/meson_options.txt b/meson_options.txt index 2b4ef9047..8c36a5ed6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -9,9 +9,9 @@ option('fwupd', type : 'boolean', value : true, description : 'enable fwupd supp option('flatpak', type : 'boolean', value : true, description : 'enable Flatpak support') option('malcontent', type : 'boolean', value : true, description : 'enable parental controls support using libmalcontent') option('rpm_ostree', type : 'boolean', value : false, description : 'enable rpm-ostree support') -option('webapps', type : 'boolean', value : false, description : 'enable webapps support') -option('hardcoded_foss_webapps', type : 'boolean', value : false, description : 'enable inclusion of a default set of installable FOSS webapps') -option('hardcoded_proprietary_webapps', type : 'boolean', value : false, description : 'enable inclusion of a default set of installable proprietary webapps') +option('webapps', type : 'boolean', value : true, description : 'enable webapps support') +option('hardcoded_foss_webapps', type : 'boolean', value : true, description : 'enable inclusion of a default set of installable FOSS webapps') +option('hardcoded_proprietary_webapps', type : 'boolean', value : true, description : 'enable inclusion of a default set of installable proprietary webapps') option('gudev', type : 'boolean', value : true, description : 'enable GUdev support') option('apt', type : 'boolean', value : false, description : 'enable apt: URL handler in the .desktop file') option('snap', type : 'boolean', value : false, description : 'enable Snap support') -- GitLab