Skip to content

Commit 8a7807f

Browse files
Copilotlijy91
andcommitted
Replace libayatana-appindicator with D-Bus StatusNotifierItem implementation
Co-authored-by: lijy91 <3889523+lijy91@users.noreply.github.com>
1 parent f6d17fe commit 8a7807f

File tree

4 files changed

+404
-233
lines changed

4 files changed

+404
-233
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
run: |
110110
cmake --version
111111
sudo apt-get update
112-
sudo apt-get install -y ninja-build libgtk-3-dev libx11-dev libxi-dev libayatana-appindicator3-dev
112+
sudo apt-get install -y ninja-build libgtk-3-dev libx11-dev libxi-dev
113113
114114
- name: Configure CMake
115115
shell: bash

src/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
3333
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
3434
pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
3535
pkg_check_modules(XI REQUIRED IMPORTED_TARGET xi)
36-
pkg_check_modules(AYATANA_APPINDICATOR REQUIRED IMPORTED_TARGET ayatana-appindicator3-0.1)
3736
elseif(APPLE)
3837
file(GLOB PLATFORM_SOURCES "platform/macos/*.mm")
3938
elseif(CMAKE_SYSTEM_NAME STREQUAL "OHOS")
@@ -73,7 +72,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS")
7372
target_link_libraries(nativeapi PUBLIC "-framework UIKit" "-framework Foundation" "-framework CoreGraphics")
7473
target_compile_options(nativeapi PRIVATE "-x" "objective-c++")
7574
elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
76-
target_link_libraries(nativeapi PUBLIC PkgConfig::GTK PkgConfig::X11 PkgConfig::XI PkgConfig::AYATANA_APPINDICATOR pthread)
75+
target_link_libraries(nativeapi PUBLIC PkgConfig::GTK PkgConfig::X11 PkgConfig::XI pthread)
7776
elseif(APPLE)
7877
target_link_libraries(nativeapi PUBLIC "-framework Cocoa")
7978
target_link_libraries(nativeapi PUBLIC "-framework Carbon")

0 commit comments

Comments
 (0)