Use start script to start on Wayland

This commit is contained in:
Victor Tran 2023-10-09 22:25:49 +11:00
parent d4e61c00cb
commit 9f7e8a60e1
No known key found for this signature in database
4 changed files with 13 additions and 3 deletions

View file

@ -132,7 +132,7 @@ portal_register_wayland_protocol_extension(xdg-portal FILES
backend/wlr-screencopy-unstable-v1.xml
)
target_link_libraries(xdg-portal Qt::Widgets Qt::Network Qt::DBus Qt::WaylandClient libcontemporary libtdesktopenvironment libthedesk libthefile)
target_link_libraries(xdg-portal Qt::Widgets Qt::Network Qt::DBus Qt::WaylandClient Qt::GuiPrivate libcontemporary libtdesktopenvironment libthedesk libthefile)
target_include_directories(xdg-portal PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
install(TARGETS xdg-portal

View file

@ -53,6 +53,8 @@ cntp_target_name(startdesk "startdesk")
target_link_libraries(startdesk Qt::Widgets Qt::Network Qt::DBus libcontemporary libtdesktopenvironment libthedesk)
configure_file(thedesk.desktop.in ${CMAKE_BINARY_DIR}/thedesk.desktop)
configure_file(thedesk-wayland.desktop.in ${CMAKE_BINARY_DIR}/thedesk-wayland.desktop)
configure_file(start-thedesk-wayland.in ${CMAKE_BINARY_DIR}/start-thedesk-wayland)
install(TARGETS startdesk
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@ -64,3 +66,9 @@ install(FILES wayfire-thedesk-config.conf
install(FILES ${CMAKE_BINARY_DIR}/thedesk.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/xsessions)
install(FILES ${CMAKE_BINARY_DIR}/thedesk-wayland.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/wayland-sessions)
install(FILES ${CMAKE_BINARY_DIR}/start-thedesk-wayland
DESTINATION ${CMAKE_INSTALL_BINDIR})

View file

@ -0,0 +1,2 @@
#!/bin/sh
exec wayfire --config ${CMAKE_INSTALL_FULL_DATADIR}/thedesk/startdesk/wayfire-thedesk-config.conf

View file

@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
Exec=/usr/bin/wayfire --config /usr/share/thedesk/startdesk/wayfire-thedesk-config.conf
TryExec=/usr/bin/wayfire
Exec=${CMAKE_INSTALL_FULL_BINDIR}/start-thedesk-wayland
TryExec=${CMAKE_INSTALL_FULL_BINDIR}/wayfire
DesktopNames=theDesk
Name=theDesk on Wayland
Comment=theDesk Desktop Environment