Skip to content

Commit a0ddefe

Browse files
committed
cnativeapi: stop requiring libayatana-appindicator on Linux
Nothing in the core includes or calls it any more — the tray icon is a StatusNotifierItem over D-Bus — but the plugin's CMake file still had it as a REQUIRED package and linked it, so every Linux build of an app using nativeapi failed without libayatana-appindicator3-dev installed. Found by tray_manager's CI, which had stopped installing it.
1 parent 03deb0d commit a0ddefe

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ jobs:
205205
cmake \
206206
ninja-build \
207207
clang \
208-
libayatana-appindicator3-dev
208+
libx11-dev \
209+
libxi-dev
209210
210211
- name: Build cnativeapi example Linux
211212
run: |

‎packages/cnativeapi/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## Unreleased
2+
3+
* Linux: building no longer asks for `libayatana-appindicator3-dev`. The tray icon has been a
4+
StatusNotifierItem over D-Bus for a while; only the plugin's CMake file still required
5+
and linked the library.
6+
17
## 0.2.7
28

39
* Same as 0.2.6; released together with nativeapi 0.2.7 (there is no nativeapi 0.2.6).

‎packages/cnativeapi/src/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
4949
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
5050
pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
5151
pkg_check_modules(XI REQUIRED IMPORTED_TARGET xi)
52-
pkg_check_modules(AYATANA_APPINDICATOR REQUIRED IMPORTED_TARGET ayatana-appindicator3-0.1)
5352
elseif (APPLE)
5453
file(GLOB PLATFORM_SOURCES "${LIBNATIVEAPI_SRC_DIR}/platform/macos/*.mm")
5554
# Find required frameworks for macOS
@@ -94,7 +93,6 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
9493
PkgConfig::GTK
9594
PkgConfig::X11
9695
PkgConfig::XI
97-
PkgConfig::AYATANA_APPINDICATOR
9896
pthread
9997
)
10098
elseif (APPLE)

0 commit comments

Comments
 (0)