49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From ff379fb93ae2539bf9fae70ccc8e0351e5665fb0 Mon Sep 17 00:00:00 2001
|
|
From: Carlos Garnacho <carlosg@gnome.org>
|
|
Date: Mon, 5 Oct 2020 12:13:07 +0200
|
|
Subject: [PATCH] backend: Don't pull generated headers (indirectly)
|
|
|
|
Use a typedef for MetaRemoteDesktop, so tests poking MetaBackend don't
|
|
indirectly depend upon generated headers. This is arguably a code fix
|
|
for a build system bug.
|
|
|
|
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1470
|
|
|
|
Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1449
|
|
(or something...)
|
|
---
|
|
src/backends/meta-backend-private.h | 4 ----
|
|
src/backends/meta-backend-types.h | 4 ++++
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git src/backends/meta-backend-private.h src/backends/meta-backend-private.h
|
|
index 6d7d3ad758..5f4981fda5 100644
|
|
--- src/backends/meta-backend-private.h
|
|
+++ src/backends/meta-backend-private.h
|
|
@@ -42,10 +42,6 @@
|
|
#include "backends/meta-settings-private.h"
|
|
#include "core/util-private.h"
|
|
|
|
-#ifdef HAVE_REMOTE_DESKTOP
|
|
-#include "backends/meta-remote-desktop.h"
|
|
-#endif
|
|
-
|
|
#define DEFAULT_XKB_RULES_FILE "evdev"
|
|
#define DEFAULT_XKB_MODEL "pc105+inet"
|
|
|
|
diff --git src/backends/meta-backend-types.h src/backends/meta-backend-types.h
|
|
index 4753c07440..146a8c3d7c 100644
|
|
--- src/backends/meta-backend-types.h
|
|
+++ src/backends/meta-backend-types.h
|
|
@@ -59,4 +59,8 @@ typedef struct _MetaScreenCastStream MetaScreenCastStream;
|
|
|
|
typedef struct _MetaWaylandCompositor MetaWaylandCompositor;
|
|
|
|
+#ifdef HAVE_REMOTE_DESKTOP
|
|
+typedef struct _MetaRemoteDesktop MetaRemoteDesktop;
|
|
+#endif
|
|
+
|
|
#endif /* META_BACKEND_TYPE_H */
|
|
--
|
|
GitLab
|
|
|