[network-manager-applet/th/tmp: 1/3] build/meson: enable support for appindicator support by default

[Thomas Haller <thaller src gnome org>]

commit d804cb12cefa8c069d5b92c48ee91b32d71a4433
Author: Rhys Perry <rhysperry111 gmail com>
Date:   Thu Jun 18 09:03:33 2020 +0000

    build/meson: enable support for appindicator support by default
    
    [thaller redhat com: squashed original commits and edit commit message]
    
    https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/ ## 82

 .gitlab-ci.yml       | 3 ++-
 meson_options.txt    | 2 +-
 scripts/gitlab-ci.sh | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80dded5c..f8ecf49e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ fedora_meson_full:
       -Dselinux=true
       -Dteam=true
       -Dld_gc=true
-      -Dappindicator=no
+      -Dappindicator=yes
       -Dmore_asserts=yes
       network-manager-applet-*/ build
     - ninja -v -C build
@@ -106,6 +106,7 @@ fedora_autotools_full:
       --enable-nls
       --enable-schemas-compile
       --enable-more-warnings
+      --with-appindicator
       --with-wwan
       --with-selinux
       --with-team
diff --git a/meson_options.txt b/meson_options.txt
index 15f96450..1a19935e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-option('appindicator', type: 'string', value: 'no', description: 'Build with lib(ayatana-)appindicator 
support in addition to xembed systray support (no|yes|auto|ayatana|ubuntu). Default is "no", "yes" is an 
alias for "auto".')
+option('appindicator', type: 'string', value: 'yes', description: 'Build with lib(ayatana-)appindicator 
support in addition to xembed systray support (no|yes|auto|ayatana|ubuntu). Default is "yes", "yes" is an 
alias for "auto".')
 option('wwan', type: 'boolean', value: true, description: 'Enable WWAN support.')
 option('selinux', type: 'boolean', value: true, description: 'Enable support for adjusting SELinux labels in 
configuration editor.')
 option('team', type: 'boolean', value: true, description: 'Enable team configuration editor.')
diff --git a/scripts/gitlab-ci.sh b/scripts/gitlab-ci.sh
index 566eb1e4..f5a22caf 100755
--- a/scripts/gitlab-ci.sh
+++ b/scripts/gitlab-ci.sh
@@ -41,6 +41,8 @@ fedora_pkg_full() {
         jansson-devel \
         ModemManager-glib-devel \
         libselinux-devel \
+        libappindicator-gtk3-devel \
+        libdbusmenu-gtk3-devel \
         #
 }