From d542359cc01fbeaf700a0cb85bf78f17f7d1eaef Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Thu, 10 Sep 2026 00:17:42 +0200 Subject: [PATCH] Use the system wayland-protocols package. --- .github/workflows/appimage.yml | 2 +- profiler/CMakeLists.txt | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 0c8e5258..fa16b6f3 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -31,7 +31,7 @@ jobs: build-essential cmake ninja-build meson pkg-config git ca-certificates \ curl file desktop-file-utils nodejs patchelf \ libegl-dev libxkbcommon-dev libdbus-1-dev libssl-dev \ - libffi-dev libexpat1-dev + libffi-dev libexpat1-dev wayland-protocols - name: Trust git repo run: git config --global --add safe.directory '*' - uses: actions/checkout@v4 diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index 754ee49f..e6b146c6 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -230,43 +230,39 @@ if(USE_WAYLAND) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/FindWaylandScanner.cmake) - CPMAddPackage( - NAME wayland-protocols - GIT_REPOSITORY https://gitlab.freedesktop.org/wayland/wayland-protocols.git - GIT_TAG 1.47 - DOWNLOAD_ONLY YES - ) + pkg_check_modules(WAYLAND_PROTOCOLS REQUIRED wayland-protocols) + pkg_get_variable(WAYLAND_PROTOCOLS_PKGDATADIR wayland-protocols pkgdatadir) ecm_add_wayland_client_protocol(PROFILER_FILES - PROTOCOL ${wayland-protocols_SOURCE_DIR}/stable/xdg-shell/xdg-shell.xml + PROTOCOL ${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/xdg-shell/xdg-shell.xml BASENAME xdg-shell ) ecm_add_wayland_client_protocol(PROFILER_FILES - PROTOCOL ${wayland-protocols_SOURCE_DIR}/staging/xdg-activation/xdg-activation-v1.xml + PROTOCOL ${WAYLAND_PROTOCOLS_PKGDATADIR}/staging/xdg-activation/xdg-activation-v1.xml BASENAME xdg-activation ) ecm_add_wayland_client_protocol(PROFILER_FILES - PROTOCOL ${wayland-protocols_SOURCE_DIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml + PROTOCOL ${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml BASENAME xdg-decoration ) ecm_add_wayland_client_protocol(PROFILER_FILES - PROTOCOL ${wayland-protocols_SOURCE_DIR}/staging/fractional-scale/fractional-scale-v1.xml + PROTOCOL ${WAYLAND_PROTOCOLS_PKGDATADIR}/staging/fractional-scale/fractional-scale-v1.xml BASENAME fractional-scale ) ecm_add_wayland_client_protocol(PROFILER_FILES - PROTOCOL ${wayland-protocols_SOURCE_DIR}/stable/viewporter/viewporter.xml + PROTOCOL ${WAYLAND_PROTOCOLS_PKGDATADIR}/stable/viewporter/viewporter.xml BASENAME viewporter ) ecm_add_wayland_client_protocol(PROFILER_FILES - PROTOCOL ${wayland-protocols_SOURCE_DIR}/staging/cursor-shape/cursor-shape-v1.xml + PROTOCOL ${WAYLAND_PROTOCOLS_PKGDATADIR}/staging/cursor-shape/cursor-shape-v1.xml BASENAME cursor-shape ) ecm_add_wayland_client_protocol(PROFILER_FILES - PROTOCOL ${wayland-protocols_SOURCE_DIR}/unstable/tablet/tablet-unstable-v2.xml + PROTOCOL ${WAYLAND_PROTOCOLS_PKGDATADIR}/unstable/tablet/tablet-unstable-v2.xml BASENAME tablet ) ecm_add_wayland_client_protocol(PROFILER_FILES - PROTOCOL ${wayland-protocols_SOURCE_DIR}/staging/xdg-toplevel-icon/xdg-toplevel-icon-v1.xml + PROTOCOL ${WAYLAND_PROTOCOLS_PKGDATADIR}/staging/xdg-toplevel-icon/xdg-toplevel-icon-v1.xml BASENAME xdg-toplevel-icon ) elseif(EMSCRIPTEN)