Skip to content
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.

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

Transition to libaytana-appindicator3 from libappindicator3 #57

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
4 changes: 2 additions & 2 deletions tray/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tray/tray.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void tray_update(struct tray *tray);
#if defined(TRAY_APPINDICATOR)

#include <gtk/gtk.h>
#include <libappindicator/app-indicator.h>
#include <libayatana-appindicator/app-indicator.h>

#define TRAY_APPINDICATOR_ID "tray-id"

Expand Down