From 94919401e7259d4938cb3eaf03f497722a04be88 Mon Sep 17 00:00:00 2001 From: Victor Tran Date: Mon, 9 Oct 2023 21:58:48 +1100 Subject: [PATCH] Move Wayland protocols to Wayland plugin --- .gitmodules | 4 ++-- lib/CMakeLists.txt | 4 ---- plugins/wayland/CMakeLists.txt | 7 +++++-- .../tdesktopenvironment-accessibility-v1.xml | 0 .../tdesktopenvironment-keygrab-v1.xml | 0 .../wlr-layer-shell-unstable-v1.xml | 0 .../wayland}/wayland-protocols/wayland-protocols | 0 {lib => plugins/wayland}/wayland-protocols/wlr-protocols | 0 wayland-layer-shell/client-lib/CMakeLists.txt | 2 +- wayland-layer-shell/qt-plugin/CMakeLists.txt | 2 +- 10 files changed, 9 insertions(+), 10 deletions(-) rename {lib => plugins/wayland}/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-accessibility-v1.xml (100%) rename {lib => plugins/wayland}/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-keygrab-v1.xml (100%) rename {lib => plugins/wayland}/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml (100%) rename {lib => plugins/wayland}/wayland-protocols/wayland-protocols (100%) rename {lib => plugins/wayland}/wayland-protocols/wlr-protocols (100%) diff --git a/.gitmodules b/.gitmodules index ab0e2f2..4833699 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "lib/wayland-protocols/wayland-protocols"] - path = lib/wayland-protocols/wayland-protocols + path = plugins/wayland/wayland-protocols/wayland-protocols url = https://gitlab.freedesktop.org/wayland/wayland-protocols.git [submodule "lib/wayland-protocols/wlr-protocols"] - path = lib/wayland-protocols/wlr-protocols + path = plugins/wayland/wayland-protocols/wlr-protocols url = https://gitlab.freedesktop.org/wlroots/wlr-protocols.git diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 7024a4c..9394662 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -145,8 +145,4 @@ install(TARGETS libtdesktopenvironment LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install(DIRECTORY wayland-protocols/tdesktopenvironment-protocols - DESTINATION ${CMAKE_INSTALL_DATADIR}/libtdesktopenvironment/wayland-protocols -) - cntp_mark_support_library_directory() diff --git a/plugins/wayland/CMakeLists.txt b/plugins/wayland/CMakeLists.txt index b5bde81..007206b 100644 --- a/plugins/wayland/CMakeLists.txt +++ b/plugins/wayland/CMakeLists.txt @@ -41,8 +41,11 @@ else() tdesktopenvironment_register_wayland_protocol_extension(plugin-${PLUGIN_NAME} FILES ../../lib/wayland-protocols/wlr-protocols/unstable/wlr-foreign-toplevel-management-unstable-v1.xml - ../../lib/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-keygrab-v1.xml - ../../lib/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-accessibility-v1.xml + wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-keygrab-v1.xml + wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-accessibility-v1.xml ../../lib/wayland-protocols/wlr-protocols/unstable/wlr-output-management-unstable-v1.xml ) + install(DIRECTORY wayland-protocols/tdesktopenvironment-protocols + DESTINATION ${CMAKE_INSTALL_DATADIR}/libtdesktopenvironment/wayland-protocols + ) endif() diff --git a/lib/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-accessibility-v1.xml b/plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-accessibility-v1.xml similarity index 100% rename from lib/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-accessibility-v1.xml rename to plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-accessibility-v1.xml diff --git a/lib/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-keygrab-v1.xml b/plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-keygrab-v1.xml similarity index 100% rename from lib/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-keygrab-v1.xml rename to plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/tdesktopenvironment-keygrab-v1.xml diff --git a/lib/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml b/plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml similarity index 100% rename from lib/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml rename to plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml diff --git a/lib/wayland-protocols/wayland-protocols b/plugins/wayland/wayland-protocols/wayland-protocols similarity index 100% rename from lib/wayland-protocols/wayland-protocols rename to plugins/wayland/wayland-protocols/wayland-protocols diff --git a/lib/wayland-protocols/wlr-protocols b/plugins/wayland/wayland-protocols/wlr-protocols similarity index 100% rename from lib/wayland-protocols/wlr-protocols rename to plugins/wayland/wayland-protocols/wlr-protocols diff --git a/wayland-layer-shell/client-lib/CMakeLists.txt b/wayland-layer-shell/client-lib/CMakeLists.txt index 9a63c1c..671de17 100644 --- a/wayland-layer-shell/client-lib/CMakeLists.txt +++ b/wayland-layer-shell/client-lib/CMakeLists.txt @@ -31,7 +31,7 @@ set(PRIVATE_HEADERS add_library(tdesktopenvironment-wayland-layer-shell-client-lib SHARED ${SOURCES} ${HEADERS} ${PRIVATE_HEADERS}) cntp_init(tdesktopenvironment-wayland-layer-shell-client-lib 20) tdesktopenvironment_register_wayland_protocol_extension(tdesktopenvironment-wayland-layer-shell-client-lib FILES - ../../lib/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml + ../../plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml ../../lib/wayland-protocols/wayland-protocols/stable/xdg-shell/xdg-shell.xml ) set_target_properties(tdesktopenvironment-wayland-layer-shell-client-lib PROPERTIES diff --git a/wayland-layer-shell/qt-plugin/CMakeLists.txt b/wayland-layer-shell/qt-plugin/CMakeLists.txt index 0bd33ce..5d7c97b 100644 --- a/wayland-layer-shell/qt-plugin/CMakeLists.txt +++ b/wayland-layer-shell/qt-plugin/CMakeLists.txt @@ -26,7 +26,7 @@ cntp_sourcelist( add_library(tdesktopenvironment-wayland-shell-qt-plugin SHARED ${SOURCES} ${HEADERS}) cntp_init(tdesktopenvironment-wayland-shell-qt-plugin 20) tdesktopenvironment_register_wayland_protocol_extension(tdesktopenvironment-wayland-shell-qt-plugin FILES - ../../lib/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml + ../../plugins/wayland/wayland-protocols/tdesktopenvironment-protocols/wlr-layer-shell-unstable-v1.xml ../../lib/wayland-protocols/wayland-protocols/stable/xdg-shell/xdg-shell.xml ) set_target_properties(tdesktopenvironment-wayland-shell-qt-plugin PROPERTIES