From 8eabc49e12a3706dbd755da7b77b99de9b58d78e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 23 Apr 2024 05:15:08 +0000 Subject: [PATCH 1/2] DisplayServer (Linux): fix silly bug that detect x11 as wayland Fix #805 --- src/detection/displayserver/linux/wayland/wayland.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/detection/displayserver/linux/wayland/wayland.c b/src/detection/displayserver/linux/wayland/wayland.c index 09ae7ae8e0..181a02b037 100644 --- a/src/detection/displayserver/linux/wayland/wayland.c +++ b/src/detection/displayserver/linux/wayland/wayland.c @@ -135,7 +135,7 @@ void ffdsConnectWayland(FFDisplayServerResult* result) const char* xdgSessionType = getenv("XDG_SESSION_TYPE"); //If XDG_SESSION_TYPE is set, and doesn't contain "wayland", we are probably not running in a wayland session. - if(xdgSessionType != NULL && ffStrEqualsIgnCase(xdgSessionType, "wayland")) + if(xdgSessionType != NULL && !ffStrEqualsIgnCase(xdgSessionType, "wayland")) return; //If XDG_SESSION_TYPE is not set, check if WAYLAND_DISPLAY or WAYLAND_SOCKET is set. From 2790493cba3a81d2f2fdfcce79628e4c61857961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 23 Apr 2024 13:43:16 +0800 Subject: [PATCH 2/2] Release: v2.10.2 --- CHANGELOG.md | 7 ++++++- CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 918416f5bd..13ee141efc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ +# 2.10.2 + +Bugfixes: +* Fix a regression that detect x11 as wayland (#805, WM, Linux) + # 2.10.1 Bugfixes: -* fix build with `-DENABLE_DBUS=OFF` +* Fix build with `-DENABLE_DBUS=OFF` (Linux) # 2.10.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index ecd30934ab..c2ac9fcdd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url project(fastfetch - VERSION 2.10.1 + VERSION 2.10.2 LANGUAGES C DESCRIPTION "Fast neofetch-like system information tool" HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"