From ba4918866fa120c65d36192aade44daf76c363cc Mon Sep 17 00:00:00 2001 From: Dan Shechter <125730+damageboy@users.noreply.github.com> Date: Sun, 24 Dec 2023 08:32:50 +0200 Subject: [PATCH] Transition to libaytana-appindicator3 from libappindicator3 libappindicator is practically unmaintained by canonical and a general transition towards the community maintained libaytana-appindicator has been going on for a while now (in ubuntu derivatives, debian : https://bugs.launchpad.net/ubuntu/+source/libayatana-appindicator/+bug/1915695 This commit switches the linux build to using the community provided `libaytana-appindicator3` and has been tested on: ubuntu, pop-os and debian. --- README.md | 2 +- build.rs | 2 +- tray/Makefile | 4 ++-- tray/tray.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 01151716..d0b549ce 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ To build native applications for Windows, just type `make`. This assumes that GN * gdk-3 * gobject-2.0 * glib-2.0 -* libappindicator3 +* libaytana-appindicator3 # Directly Incorporated Third Party Code diff --git a/build.rs b/build.rs index a332a99b..e6edaab0 100644 --- a/build.rs +++ b/build.rs @@ -14,6 +14,6 @@ fn main() { println!("cargo:rustc-link-lib=dylib=gdk-3"); println!("cargo:rustc-link-lib=dylib=gobject-2.0"); println!("cargo:rustc-link-lib=dylib=glib-2.0"); - println!("cargo:rustc-link-lib=dylib=appindicator3"); + println!("cargo:rustc-link-lib=dylib=ayatana-appindicator3"); } } diff --git a/tray/Makefile b/tray/Makefile index 21114125..2b6ed013 100644 --- a/tray/Makefile +++ b/tray/Makefile @@ -21,8 +21,8 @@ else ifeq ($(shell uname -s),Linux) else OPT_FLAGS := -Og endif - TRAY_CFLAGS := $(OPT_FLAGS) -DTRAY_APPINDICATOR=1 $(shell pkg-config --cflags appindicator3-0.1) -std=c99 - TRAY_LDFLAGS := $(shell pkg-config --libs appindicator3-0.1) + TRAY_CFLAGS := $(OPT_FLAGS) -DTRAY_APPINDICATOR=1 $(shell pkg-config --cflags ayatana-appindicator3-0.1) -std=c99 + TRAY_LDFLAGS := $(shell pkg-config --libs ayatana-appindicator3-0.1) else ifeq ($(shell uname -s),Darwin) RM=rm -f LIB_NAME=libzt_desktop_tray.a diff --git a/tray/tray.h b/tray/tray.h index fe18feab..0ed4ffcc 100644 --- a/tray/tray.h +++ b/tray/tray.h @@ -31,7 +31,7 @@ void tray_update(struct tray *tray); #if defined(TRAY_APPINDICATOR) #include -#include +#include #define TRAY_APPINDICATOR_ID "tray-id"