Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 905176 - mate-base/mate-control-center: migrate to ayatana indicators
Summary: mate-base/mate-control-center: migrate to ayatana indicators
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo MATE Desktop
URL: https://github.com/mate-desktop/mate-...
Whiteboard:
Keywords:
Depends on:
Blocks: 887171
  Show dependency tree
 
Reported: 2023-04-27 15:43 UTC by Pacho Ramos
Modified: 2023-05-14 11:14 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
ayatana-detection.patch (1.patch,13.21 KB, patch)
2023-04-28 15:08 UTC, Pacho Ramos
Details | Diff
ayatana-detection.patch (mate-control-center-1.26.0-ayatana-detection.patch,13.21 KB, patch)
2023-05-11 14:50 UTC, Pacho Ramos
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Pacho Ramos gentoo-dev 2023-04-27 15:43:10 UTC
See parent bug for rationale. For now waiting for upstream (even if it should be similar to mate-polkit patch)
https://github.com/mate-desktop/mate-control-center/issues/701
Comment 1 Pacho Ramos gentoo-dev 2023-04-28 15:08:31 UTC
Created attachment 860885 [details, diff]
ayatana-detection.patch

This works for me with 1.26.0
Comment 2 Larry the Git Cow gentoo-dev 2023-05-08 09:11:33 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f01b0847c7b169fbb664213a2854888f14acd9

commit 13f01b0847c7b169fbb664213a2854888f14acd9
Author:     Pacho Ramos <pacho@gentoo.org>
AuthorDate: 2023-05-08 08:54:52 +0000
Commit:     Pacho Ramos <pacho@gentoo.org>
CommitDate: 2023-05-08 09:11:20 +0000

    mate-base/mate-control-center: Migrate to ayatana
    
    Closes: https://bugs.gentoo.org/905176
    Signed-off-by: Pacho Ramos <pacho@gentoo.org>

 ...e-control-center-1.26.0-ayatana-detection.patch | 435 +++++++++++++++++++++
 .../mate-control-center-1.26.0-r2.ebuild           |  75 ++++
 2 files changed, 510 insertions(+)
Comment 3 Joakim Tjernlund 2023-05-08 16:28:44 UTC
Build fails when no indicators are installed:

Installed versions:  1.26.0-r1(18:54:18 06/10/22)(nls -accountsservice -appindicator -debug)


        mate-control-center 1.26.0
        ==========================

        Compiler:                  x86_64-pc-linux-gnu-gcc
        Compiler flags:            -O2 -pipe 
        Warning flags:             -Wall
        Linker flags:              -Wl,-O1 -Wl,--as-needed

        AppIndicator enabled:              no
        Ayatana AppIndicator (preferred)   yes
        Ubuntu AppIndicator (legacy)       no

        Libmate-slab:              yes
        Accountsservice:           yes
        Native Language support:   yes

Making all in po
Making all in libwindow-settings

...

libtool: link: x86_64-pc-linux-gnu-gcc -O2 -pipe -Wno-deprecated-declarations -Wno-error -fdebug-prefix-map=..=/var/tmp/portage/mate-base/mate-control-center-1.26.0-r2 -Wl,-O1 -Wl,--as-needed -o .libs/mate-control-center control-center.o -Wl,--export-dynamic  -lgmodule-2.0 -lgthread-2.0 -lxml2 ../libslab/.libs/libmate-slab.so -lmate-desktop-2 -lgtk-3 -lgdk-3 -lpangocairo-1.0 -latk-1.0 -lcairo-gobject -lstartup-notification-1 -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lmate-menu -lgio-2.0 -lpango-1.0 -lgobject-2.0 -lglib-2.0 -lharfbuzz -lm -pthread
Making all in typing-break
drwright.c:34:11: fatal error: libayatana-appindicator/app-indicator.h: No such file or directory
   34 | # include <libayatana-appindicator/app-indicator.h>
      |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
Comment 4 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2023-05-08 17:03:01 UTC
Using == in configure.ac is wrong as well for non-bash /bin/sh.
Comment 5 Pacho Ramos gentoo-dev 2023-05-11 14:46:21 UTC
(In reply to Sam James from comment #4)
> Using == in configure.ac is wrong as well for non-bash /bin/sh.

That comes as-is from mate-polkit upstream configure.ac... should it be only "="?
Comment 6 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2023-05-11 14:47:33 UTC
(In reply to Pacho Ramos from comment #5)
> (In reply to Sam James from comment #4)
> > Using == in configure.ac is wrong as well for non-bash /bin/sh.
> 
> That comes as-is from mate-polkit upstream configure.ac... should it be only
> "="?

yeah, just = will work. see e.g. https://github.com/liblouis/liblouis/pull/1369 (just copy my commit msg)
Comment 7 Pacho Ramos gentoo-dev 2023-05-11 14:50:15 UTC
Created attachment 861522 [details, diff]
ayatana-detection.patch

This uses only = and seems to work for me... but I cannot reproduce Joakim's issue... in my case it correctly disables all indicators when the USE is disabled:
        AppIndicator enabled:              no
        Ayatana AppIndicator (preferred)   no
        Ubuntu AppIndicator (legacy)       no
Comment 8 Pacho Ramos gentoo-dev 2023-05-11 14:53:14 UTC
Ah, it is when the option is disabled but the ayatana is present
Comment 9 Larry the Git Cow gentoo-dev 2023-05-14 11:14:24 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8145f732c5529b7a59d1fbefd5f5ff520cc38cec

commit 8145f732c5529b7a59d1fbefd5f5ff520cc38cec
Author:     Pacho Ramos <pacho@gentoo.org>
AuthorDate: 2023-05-14 11:11:53 +0000
Commit:     Pacho Ramos <pacho@gentoo.org>
CommitDate: 2023-05-14 11:11:53 +0000

    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>

 .../mate-control-center-1.26.0-ayatana-detection.patch   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)