From 98397126b853279d231b6876e7f68b9070ebdbfb Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 13 Apr 2024 02:24:44 +0200 Subject: [PATCH 1/2] build: adjust Linux-only header after 5cb9c3c7c715 In file included from theseus-ship-6.0.0/main_wayland.cpp:10: In file included from /usr/include/como/base/wayland/xwl_platform.h:17: In file included from /usr/include/como/render/wayland/xwl_platform.h:15: In file included from /usr/include/como/render/post/night_color_manager.h:14: /usr/include/como/base/os/clock/skew_notifier.h:8:10: fatal error: 'skew_notifier_engine.h' file not found 8 | #include "skew_notifier_engine.h" | ^~~~~~~~~~~~~~~~~~~~~~~~ --- como/base/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/como/base/CMakeLists.txt b/como/base/CMakeLists.txt index 302054eb6..c2bdbffd3 100644 --- a/como/base/CMakeLists.txt +++ b/como/base/CMakeLists.txt @@ -18,7 +18,7 @@ target_sources(base PUBLIC FILE_SET HEADERS FILES - os/clock/linux_skew_notifier_engine.h + os/clock/skew_notifier_engine.h os/clock/skew_notifier.h seat/backend/logind/session.h seat/session.h @@ -49,7 +49,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux") PUBLIC FILE_SET HEADERS FILES - os/clock/skew_notifier_engine.h + os/clock/linux_skew_notifier_engine.h PRIVATE os/clock/linux_skew_notifier_engine.cpp ) From 3763e9ca144bc9e1d4469e1c99c9ea72fae034c6 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 13 Apr 2024 02:23:58 +0200 Subject: [PATCH 2/2] fix(wl): add missing header for non-glibc after ee5bf816d1f7 como/xwl/socket.cpp:124:9: error: use of undeclared identifier 'close' close(fd); ^ como/xwl/socket.cpp:129:9: error: use of undeclared identifier 'close' close(fd); ^ como/xwl/socket.cpp:155:44: error: use of undeclared identifier 'getuid' if (info.st_uid != 0 && info.st_uid != getuid()) { ^ como/xwl/socket.cpp:184:17: error: use of undeclared identifier 'close' close(fd); ^ como/xwl/socket.cpp:223:9: error: use of undeclared identifier 'close' close(fd); ^ --- como/xwl/socket.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/como/xwl/socket.cpp b/como/xwl/socket.cpp index 6529f51bc..37cf5705f 100644 --- a/como/xwl/socket.cpp +++ b/como/xwl/socket.cpp @@ -14,6 +14,7 @@ SPDX-License-Identifier: GPL-2.0-or-later #include #include #include +#include namespace como::xwl {