isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 13:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include the pkgconfig-specified gdesktop-enums.h

Browse Source 
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
This commit is contained in:
Daniel van Vugt 2020-07-13 17:11:34 +08:00
parent 1faba58ccc
commit 7658e07beb
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/meta-input-settings-private.h
View File

@ -22,7 +22,7 @@
#ifndef META_INPUT_SETTINGS_PRIVATE_H #ifndef META_INPUT_SETTINGS_PRIVATE_H
#define 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 #ifdef HAVE_LIBWACOM
#include <libwacom/libwacom.h> #include <libwacom/libwacom.h>

2
src/meta/meta-background-actor.h
View File

@ -21,7 +21,7 @@
#ifndef META_BACKGROUND_ACTOR_H #ifndef META_BACKGROUND_ACTOR_H
#define 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 "clutter/clutter.h"
#include "meta/meta-background.h" #include "meta/meta-background.h"

2
src/meta/meta-background-content.h
View File

@ -21,7 +21,7 @@
#ifndef META_BACKGROUND_CONTENT_H #ifndef META_BACKGROUND_CONTENT_H
#define 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 "clutter/clutter.h"
#include "meta/meta-background.h" #include "meta/meta-background.h"

2
src/meta/meta-background.h
View File

@ -21,7 +21,7 @@
#ifndef META_BACKGROUND_H #ifndef META_BACKGROUND_H
#define META_BACKGROUND_H #define META_BACKGROUND_H
#include <gsettings-desktop-schemas/gdesktop-enums.h> #include <gdesktop-enums.h>
#include "clutter/clutter.h" #include "clutter/clutter.h"
#include "meta/display.h" #include "meta/display.h"