Skip to content

libayatana-indicator: Fix build with glib2 +quartz #28395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2025
Merged

libayatana-indicator: Fix build with glib2 +quartz #28395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions devel/libayatana-indicator/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ github.tarball_from archive
# https://github.com/AyatanaIndicators/libayatana-indicator/pull/76
patchfiles 0001-Fix-build-on-macOS.patch

# Fix build with glib2 +quartz
# https://github.com/AyatanaIndicators/libayatana-indicator/pull/77
patchfiles-append 0001-Remove-unnecessary-gio-gdesktopappinfo.h-include.patch

depends_build-append \
path:bin/pkg-config:pkgconfig \
path:bin/vala:vala
Expand Down
29 changes: 29 additions & 0 deletions devel/libayatana-indicator/files/0001-Remove-unnecessary-gio-gdesktopappinfo.h-include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From cee3c3ab0817783e85f150ad5120d2ce9860a124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Fri, 9 May 2025 18:27:51 +0200
Subject: [PATCH] Remove unnecessary gio/gdesktopappinfo.h include

This was introduced in 5d7fbff4c97779922efe03268deaf669a5a4eaa8 but the
code using it was removed in 0312ffa2d621b398462659429a7c2b778da93ca8 so
it is not necessary anymore now. Moreover, this header is not
available when glib is compiled with cocoa so it would break the build
in such cases.
---
src/indicator-desktop-shortcuts.c | 1 -
1 file changed, 1 deletion(-)

diff --git src/indicator-desktop-shortcuts.c src/indicator-desktop-shortcuts.c
index be1d632..99a687a 100644
--- src/indicator-desktop-shortcuts.c
+++ src/indicator-desktop-shortcuts.c
@@ -25,7 +25,6 @@ License along with this library. If not, see
#include "config.h"
#endif

-#include <gio/gdesktopappinfo.h>
#include "indicator-desktop-shortcuts.h"

#define ACTIONS_KEY "Actions"
--
2.49.0