From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-control-center/files/
Date: Sun, 14 May 2023 11:14:25 +0000 (UTC) [thread overview]
Message-ID: <1684062713.8145f732c5529b7a59d1fbefd5f5ff520cc38cec.pacho@gentoo> (raw)
commit: 8145f732c5529b7a59d1fbefd5f5ff520cc38cec
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 11:11:53 2023 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun May 14 11:11:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8145f732
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 <AT> gentoo.org>
.../mate-control-center-1.26.0-ayatana-detection.patch | 16 ++++++++--------
1 file 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
next reply other threads:[~2023-05-14 11:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-14 11:14 Pacho Ramos [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-20 16:35 [gentoo-commits] repo/gentoo:master commit in: mate-base/mate-control-center/files/ Andreas Sturmlechner
2016-12-22 15:56 Michael Palimaka
2016-08-12 13:54 NP Hardass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1684062713.8145f732c5529b7a59d1fbefd5f5ff520cc38cec.pacho@gentoo \
--to=pacho@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox