diff options
Diffstat (limited to 'gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch')
| -rw-r--r-- | gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch b/gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch new file mode 100644 index 000000000000..3938cd955ce2 --- /dev/null +++ b/gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch @@ -0,0 +1,65 @@ +https://github.com/WayfireWM/wayfire/pull/2225 + +From f7bcad19598cbff1324f7737022ffee8848b3555 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Mon, 18 Mar 2024 16:32:06 +0200 +Subject: [PATCH] Copy config.h approach from wlroots-full.hpp to other public + api headers (#2225) + +* Otherwise wayfire could use the config.h of an already installed + wayfire installation and lead to confusing linking issues if the + options differed (like installed wayfire has xwayland disabled and the + new build has it enabled). + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/src/api/wayfire/debug.hpp ++++ b/src/api/wayfire/debug.hpp +@@ -1,8 +1,12 @@ + #ifndef DEBUG_HPP + #define DEBUG_HPP + +-#ifndef WAYFIRE_PLUGIN +- #include "config.h" ++// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins ++// need to use <wayfire/config.h> ++#ifdef WF_USE_CONFIG_H ++ #include <config.h> ++#else ++ #include <wayfire/config.h> + #endif + + #define nonull(x) ((x) ? (x) : ("nil")) +--- a/src/api/wayfire/unstable/wlr-view-events.hpp ++++ b/src/api/wayfire/unstable/wlr-view-events.hpp +@@ -1,9 +1,11 @@ + #pragma once + +-#if __has_include(<wayfire/config.h>) +- #include <wayfire/config.h> ++// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins ++// need to use <wayfire/config.h> ++#ifdef WF_USE_CONFIG_H ++ #include <config.h> + #else +- #include "config.h" ++ #include <wayfire/config.h> + #endif + + #include <wayfire/nonstd/wlroots-full.hpp> +--- a/src/api/wayfire/unstable/xwl-toplevel-base.hpp ++++ b/src/api/wayfire/unstable/xwl-toplevel-base.hpp +@@ -1,9 +1,11 @@ + #pragma once + +-#if __has_include(<wayfire/config.h>) +- #include <wayfire/config.h> ++// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins ++// need to use <wayfire/config.h> ++#ifdef WF_USE_CONFIG_H ++ #include <config.h> + #else +- #include "config.h" ++ #include <wayfire/config.h> + #endif + + #include <wayfire/nonstd/wlroots-full.hpp> |