diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-06-19 09:31:32 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-06-19 09:59:13 +0200 |
| commit | 876c6e13ecf5620b034c112f6cf52a9fbe978a46 (patch) | |
| tree | 93c143037b7a0b40136f4035341550e5c50ff176 | |
| parent | 90afad941be3f46fc60e1b854fee3f85d676310c (diff) | |
| parent | 52e05a1149e0cfce3408a593319b4fd2654f83cf (diff) | |
| download | network-manager-applet-876c6e13ecf5620b034c112f6cf52a9fbe978a46.tar.gz | |
build: merge branch 'rhysperry111:appinidcator-default'
https://gitlab.gnome.org/GNOME/network-manager-applet/-/issues/89
https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/82
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | meson_options.txt | 2 | ||||
| -rwxr-xr-x | scripts/gitlab-ci.sh | 2 |
5 files changed, 13 insertions, 3 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 @@ -1,4 +1,11 @@ ======================================================= +network-manager-applet-1.18.0 +Overview of changes since network-manager-applet-1.16.0 +======================================================= + +* Enable build with appindicator by default. + +======================================================= network-manager-applet-1.16.0 Overview of changes since network-manager-applet-1.8.24 ======================================================= diff --git a/configure.ac b/configure.ac index 9a21a960..94cb4d62 100644 --- a/configure.ac +++ b/configure.ac @@ -83,7 +83,7 @@ GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10 -DGDK_VERS AC_ARG_WITH([appindicator], AS_HELP_STRING([--with-appindicator=no|yes|auto|ayatana|ubuntu], [Build with lib(ayatana-)appindicator support in addition to xembed systray support.]), - [], [with_appindicator=no]) + [], [with_appindicator=auto]) if test "$with_appindicator" != "no"; then if test "$with_appindicator" = "yes" -o "$with_appindicator" = "auto"; then PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1, [with_appindicator=ayatana], [with_appindicator=no]) 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 \ # } |