From e257f551179d47cd603a72524444c1f56bc31eac Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <antonio.larrosa@gmail.com>
Date: Wed, 11 Mar 2020 11:47:07 +0100
Subject: [PATCH] Replace the Qt check for appindicator-engine-icon with a flag
Instead of checking the Qt version installed in the system
at build time in order to guess the plasma version the user
will be running at runtime, use a configure flag to use
an engine icon in the panel or not.
This commit adds an --enable-appindicator-engine-icon flag that
is enabled if appindicator is enabled (the default) and can
be disabled with --disable-appindicator-engine-icon .
This flag (as well as the check it replace) only seems to
affect the code at:
https://github.com/ibus/ibus/commit/35d035bfc48e20eecb3b3b3b14712d73c5fc027b#diff-498e61e4c9c641bf36042acdbb2eee53R1251
---
configure.ac | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2917c10b..6eb6088b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,26 +300,27 @@ else
AC_SUBST(wayland_scanner_rules)
fi
-enable_appindicator_engine_icon="no"
if test x"$enable_appindicator" = x"yes"; then
enable_appindicator="yes (enabled, use --disable-appindicator to disable)"
- # Need qt5-qtbase-devel package
- # There is no way to check the version of KStatusNotifierItem and
- # check the version of qtbase here.
- AC_MSG_CHECKING([for KDE5 appindicator engine icon])
- PKG_CHECK_EXISTS([Qt5Gui >= 5.4],
- enable_appindicator_engine_icon="yes"
- )
- AC_MSG_RESULT([$enable_appindicator_engine_icon])
-
-fi
-if test x"$enable_appindicator_engine_icon" != x"yes" ; then
- enable_appindicator_engine_icon="no (disabled, need qtbase-devel 5.4 or later)"
+ # --enable-appindicator-engine-icon option.
+ AC_ARG_ENABLE(appindicator_engine_icon,
+ AS_HELP_STRING([--enable-appindicator_engine_icon],
+ [Build appindicator engine icon support]),
+ [enable_appindicator_engine_icon=$enableval],
+ [enable_appindicator_engine_icon=yes]
+ )
+else
+ enable_appindicator_engine_icon="no (disabled since appindicator is disabled)"
fi
+
AM_CONDITIONAL([ENABLE_APPINDICATOR_ENGINE_ICON],
[test x"$enable_appindicator_engine_icon" = x"yes"])
+if test x"$enable_appindicator_engine_icon" = x"yes"; then
+ enable_appindicator_engine_icon="yes (enabled, use --disable-appindicator-engine-icon to disable)"
+fi
+
# GObject introspection
GOBJECT_INTROSPECTION_CHECK([0.6.8])
--
2.25.1