[gnome-software] build: Enable malcontent plugin by default



commit 77e2b124fa99127278526769a3ebc4b14c139457
Author: Philip Withnall <withnall endlessm com>
Date:   Wed Oct 2 15:34:51 2019 +0100

    build: Enable malcontent plugin by default
    
    It should be ready to build by default. It was only disabled by default
    when merged as that merge request was intended to target a
    feature-frozen branch. We’re no longer in feature freeze.
    
    For the moment, though, we have to disable it in the CI, as
    libmalcontent isn’t available there yet.
    
    Signed-off-by: Philip Withnall <withnall endlessm com>

 .gitlab-ci.yml    | 2 +-
 meson_options.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9753e3c1..92f1826d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ before_script:
 build-gnome-software:
   stage: build
   script:
-  - meson -Drpm_ostree=true _build .
+  - meson -Drpm_ostree=true -Dmalcontent=false _build .
   - ninja -v -C _build
   - mkdir -p /run/dbus
   - mkdir -p /var
diff --git a/meson_options.txt b/meson_options.txt
index ef46e5ce..74af14ba 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,7 +8,7 @@ option('polkit', type : 'boolean', value : true, description : 'enable PolKit su
 option('eos_updater', type : 'boolean', value : false, description : 'enable eos-updater support')
 option('fwupd', type : 'boolean', value : true, description : 'enable fwupd support')
 option('flatpak', type : 'boolean', value : true, description : 'enable Flatpak support')
-option('malcontent', type : 'boolean', value : false, description : 'enable parental controls support using 
libmalcontent')
+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('shell_extensions', type : 'boolean', value : true, description : 'enable shell extensions support')
 option('odrs', type : 'boolean', value : true, description : 'enable ODRS support')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]