GNOME Bugzilla – Bug 795333
Support building against Ayatana Indicators
Last modified: 2018-04-20 07:30:12 UTC
Created attachment 371050 [details] [review] Support building against Ayatana AppIndicator Please consider applying the attached patch upstream. The patch was originally file against the nm-applet package in Debian BTS and the maintainer asked me to report it upstream: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=880169 In Debian and Ubuntu, we are currently moving Indicators support over to a non-Ubuntu upstream project, named Ayatana Indicators [1]. The idea behind this effort is, that Ubuntu Indicators will be made available to all Linux distros and support various desktop environments. One part of this effort is porting applications providing an AppIndicator / SNI based systray icon over to Ayatana AppIndicator [2]. For some thoughts about the switch over to Ayatana Indicators, see [3] (and earlier block posts + my talk on DebConf17 [4]). [1] https://github.com/AyatanaIndicators [2] https://github.com/AyatanaIndicators/libayatana-appindicator [3] https://sunweavers.net/blog/node/67 [4] https://sunweavers.net/blog/node/60
Hi, For the moment, we support both meson and autotools in parallel. Any changes to Makefiles must also be done for meson.
Created attachment 371068 [details] [review] Meson build support for Ayatana AppIndicator Find attached a second patch that adds Ayatana AppIndicator support to the meson build flow.
Hi, perhaps we could reuse the same config option for both libraries (--with-appindicator=yes|ayatana) and also use the same build flags: if yes PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1) ... else if ayatana PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1) ... Otherwise LGTM.
Hi Benjamino (In reply to Beniamino Galvani from comment #3) > Hi, > > perhaps we could reuse the same config option for both libraries > (--with-appindicator=yes|ayatana) and also use the same build flags: > > if yes > PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1) > ... > else if ayatana > PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1) > ... Please let me know, if this is a request to update the patches I provided. (Or is it rather a "nice-to-have-could-be-would-be" type of thought?) Please let me know and I revisit the patchset. > Otherwise LGTM. Cool! + THANKS! Mike
I agree with Beniamino's suggestion, because currently the nonsensical combination of enabling both --with-appindicator and --with-ayatana-appindicator would result in unexpected behavior. Mike, please one last change. Could you please adjust the patch (and possibly squash it with the meson patch). Thanks!!
Created attachment 371125 [details] [review] Support building against Ayatana AppIndicator (v2) Hi, here the revised patch, hope that meets your requirements. For autotools, I used an env var to pass in the AppIndicator variant. In meson, I turned the appindicator option from Boolean to string. Mike
v2 merged as https://git.gnome.org/browse/network-manager-applet/commit/?id=bfd4f4cc7b14a6312c861a427bd4bf60bc405901 + a follow-up https://git.gnome.org/browse/network-manager-applet/commit/?id=c0d4880aa3f4589899adfed7c6f0fcf13cd3dd49 Thanks!!