mutter: update to 3.38.1.

This commit is contained in:
Nafis 2020-10-06 04:51:42 +06:00 committed by Đoàn Trần Công Danh
parent 1407ea66f6
commit 0a6c324dc9
2 changed files with 58 additions and 2 deletions

View file

@ -0,0 +1,49 @@
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

View file

@ -1,6 +1,6 @@
# Template file for 'mutter'
pkgname=mutter
version=3.38.0
version=3.38.1
revision=1
build_helper="gir"
build_style=meson
@ -18,10 +18,17 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Projects/Mutter/"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=058ed13d102085d3e9b6fa5564c66050a478c364a0cc55bc844fea3ddcd90eab
checksum=e921570c9fdf63805dbd40aa21daa05504a1b9a21432d6119c54c17ee0217a33
shlib_provides="libmutter-clutter-7.so libmutter-cogl-7.so
libmutter-cogl-pango-7.so libmutter-cogl-path-7.so"
case "$XBPS_MACHINE" in i686*)
pre_build() {
ninja ${makejobs} -C build src/meta-dbus-display-config.h
}
;;
esac
# needs X
do_check() {
: