diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2023-05-14 13:11:53 +0200 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2023-05-14 13:11:53 +0200 |
| commit | 8145f732c5529b7a59d1fbefd5f5ff520cc38cec (patch) | |
| tree | 4dc67d94760c055a978aa8a89a2a2744ea6bc81c /mate-base | |
| parent | app-text/foliate: DEPEND on webkit-gtk:4.1 (diff) | |
| download | gentoo-8145f732c5529b7a59d1fbefd5f5ff520cc38cec.tar.gz gentoo-8145f732c5529b7a59d1fbefd5f5ff520cc38cec.tar.bz2 gentoo-8145f732c5529b7a59d1fbefd5f5ff520cc38cec.zip | |
mate-base/mate-control-center: Fix ayatana patch
Fix building when library is found but support is disabled, and remove bashisms
Thanks-to: Joakim Tjernlund
Thanks-to: Sam James
Closes: https://bugs.gentoo.org/905176
Signed-off-by: Pacho Ramos <pacho@gentoo.org>
Diffstat (limited to 'mate-base')
| -rw-r--r-- | mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch b/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch index c8253b7fbf7f..ed1c8aec619e 100644 --- a/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch +++ b/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch @@ -26,9 +26,9 @@ - PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED], - enable_appindicator="yes", - enable_appindicator="no") -+if test "x$enable_appindicator" == "xauto" && -+ (test "x$have_appindicator_ayatana" == "xyes" || -+ test "x$have_appindicator_ubuntu" == "xyes"); then ++if test "x$enable_appindicator" = "xauto" && ++ (test "x$have_appindicator_ayatana" = "xyes" || ++ test "x$have_appindicator_ubuntu" = "xyes"); then + AC_MSG_NOTICE([Enabling AppIndicator support (as --enable-appindicator=auto was used).]) + enable_appindicator="yes" fi @@ -41,15 +41,15 @@ - AC_SUBST(APP_INDICATOR_CFLAGS) - AC_SUBST(APP_INDICATOR_LIBS) - AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator]) -+if test "x$enable_appindicator" == "xyes"; then -+ if test "x$have_appindicator_ayatana" == "xyes"; then ++if test "x$enable_appindicator" = "xyes"; then ++ if test "x$have_appindicator_ayatana" = "xyes"; then + AC_MSG_NOTICE([Buidling against Ayatana AppIndicator.]) + PKG_CHECK_MODULES(AYATANA_APPINDICATOR, + [$AYATANA_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED], + [AC_DEFINE(HAVE_AYATANA_APPINDICATOR, 1, [Have Ayatana AppIndicator])]) + AC_SUBST(AYATANA_APPINDICATOR_CFLAGS) + AC_SUBST(AYATANA_APPINDICATOR_LIBS) -+ elif test "x$have_appindicator_ubuntu" == "xyes"; then ++ elif test "x$have_appindicator_ubuntu" = "xyes"; then + AC_MSG_NOTICE([Buidling against Ubuntu AppIndicator.]) + PKG_CHECK_MODULES(UBUNTU_APPINDICATOR, + [$UBUNTU_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED], @@ -61,8 +61,8 @@ + fi fi -AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes) -+AM_CONDITIONAL(HAVE_AYATANA_APPINDICATOR, test x"$have_appindicator_ayatana" = xyes) -+AM_CONDITIONAL(HAVE_UBUNTU_APPINDICATOR, test x"$have_appindicator_ubuntu" = xyes) ++AM_CONDITIONAL(HAVE_AYATANA_APPINDICATOR, test x"$have_appindicator_ayatana" = xyes -a x"$enable_appindicator" = xyes) ++AM_CONDITIONAL(HAVE_UBUNTU_APPINDICATOR, test x"$have_appindicator_ubuntu" = xyes -a x"$enable_appindicator" = xyes) dnl keyboard-properties-capplet savecppflags=$CPPFLAGS |