mirror of
https://github.com/youwen5/nixos.git
synced 2024-11-24 17:53:51 -08:00
fix: build hyprland successfully
This commit is contained in:
parent
e1cbf35efb
commit
365d08298c
1 changed files with 385 additions and 403 deletions
|
@ -2554,24 +2554,6 @@ index a6063ee9..e7742b35 100644
|
||||||
void frameData(CMonitor*);
|
void frameData(CMonitor*);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
diff --git a/src/debug/Log.cpp b/src/debug/Log.cpp
|
|
||||||
index 0def77c0..a4c5b08e 100644
|
|
||||||
--- a/src/debug/Log.cpp
|
|
||||||
+++ b/src/debug/Log.cpp
|
|
||||||
@@ -5,10 +5,13 @@
|
|
||||||
|
|
||||||
#include <fstream>
|
|
||||||
#include <iostream>
|
|
||||||
+#include <fcntl.h>
|
|
||||||
|
|
||||||
void Debug::init(const std::string& IS) {
|
|
||||||
logFile = IS + (ISDEBUG ? "/hyprlandd.log" : "/hyprland.log");
|
|
||||||
logOfs.open(logFile, std::ios::out | std::ios::app);
|
|
||||||
+ auto handle = logOfs.native_handle();
|
|
||||||
+ fcntl(handle, F_SETFD, FD_CLOEXEC);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Debug::close() {
|
|
||||||
diff --git a/src/desktop/LayerSurface.cpp b/src/desktop/LayerSurface.cpp
|
diff --git a/src/desktop/LayerSurface.cpp b/src/desktop/LayerSurface.cpp
|
||||||
index 8fd448ef..c352fa74 100644
|
index 8fd448ef..c352fa74 100644
|
||||||
--- a/src/desktop/LayerSurface.cpp
|
--- a/src/desktop/LayerSurface.cpp
|
||||||
|
@ -3874,7 +3856,7 @@ index f2a7ab53..6f000f9f 100644
|
||||||
+ auto* gSettingsSchemaSource = g_settings_schema_source_get_default();
|
+ auto* gSettingsSchemaSource = g_settings_schema_source_get_default();
|
||||||
+
|
+
|
||||||
+ if (!gSettingsSchemaSource) {
|
+ if (!gSettingsSchemaSource) {
|
||||||
+ Debug::log(WARN, "GSettings default schema source does not exist, cant sync GSettings");
|
+ Debug::log(WARN, "GSettings default schema source does not exist, can't sync GSettings");
|
||||||
+ return false;
|
+ return false;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
|
|
Loading…
Reference in a new issue