From 7658e07beb2f91a9ea3ba13084bc936cfc6c891f Mon Sep 17 00:00:00 2001
From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Mon, 13 Jul 2020 17:11:34 +0800
Subject: [PATCH] Include the pkgconfig-specified gdesktop-enums.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of blindly hoping that `$INCLUDE` contains the parent directory
of `gsettings-desktop-schemas`.

Because `gsettings-desktop-schemas.pc` says:
```
Cflags: -I/SOME/DIRECTORY/gsettings-desktop-schemas
```
Which means to include the version that Meson has configured you need
to drop the directory prefix and only `#include <gdesktop-enums.h>`.

This fixes a build failure with local installs triggered by 775ec67a44
but it's also the right thing to do™.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1370
---
 src/backends/meta-input-settings-private.h | 2 +-
 src/meta/meta-background-actor.h           | 2 +-
 src/meta/meta-background-content.h         | 2 +-
 src/meta/meta-background.h                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backends/meta-input-settings-private.h b/src/backends/meta-input-settings-private.h
index 1a7b258ec..0b8ac29ce 100644
--- a/src/backends/meta-input-settings-private.h
+++ b/src/backends/meta-input-settings-private.h
@@ -22,7 +22,7 @@
 #ifndef META_INPUT_SETTINGS_PRIVATE_H
 #define META_INPUT_SETTINGS_PRIVATE_H
 
-#include <gsettings-desktop-schemas/gdesktop-enums.h>
+#include <gdesktop-enums.h>
 
 #ifdef HAVE_LIBWACOM
 #include <libwacom/libwacom.h>
diff --git a/src/meta/meta-background-actor.h b/src/meta/meta-background-actor.h
index 7600b1a38..3008edcfd 100644
--- a/src/meta/meta-background-actor.h
+++ b/src/meta/meta-background-actor.h
@@ -21,7 +21,7 @@
 #ifndef META_BACKGROUND_ACTOR_H
 #define META_BACKGROUND_ACTOR_H
 
-#include <gsettings-desktop-schemas/gdesktop-enums.h>
+#include <gdesktop-enums.h>
 
 #include "clutter/clutter.h"
 #include "meta/meta-background.h"
diff --git a/src/meta/meta-background-content.h b/src/meta/meta-background-content.h
index 48a44dfba..f30cdbfab 100644
--- a/src/meta/meta-background-content.h
+++ b/src/meta/meta-background-content.h
@@ -21,7 +21,7 @@
 #ifndef META_BACKGROUND_CONTENT_H
 #define META_BACKGROUND_CONTENT_H
 
-#include <gsettings-desktop-schemas/gdesktop-enums.h>
+#include <gdesktop-enums.h>
 
 #include "clutter/clutter.h"
 #include "meta/meta-background.h"
diff --git a/src/meta/meta-background.h b/src/meta/meta-background.h
index 1c255995c..550b1d986 100644
--- a/src/meta/meta-background.h
+++ b/src/meta/meta-background.h
@@ -21,7 +21,7 @@
 #ifndef META_BACKGROUND_H
 #define META_BACKGROUND_H
 
-#include <gsettings-desktop-schemas/gdesktop-enums.h>
+#include <gdesktop-enums.h>
 
 #include "clutter/clutter.h"
 #include "meta/display.h"