forked from brl/citadel
Fixed mutter builds in Docker
- Fixed a dependency sourcing problem in meson build libmutter_dep - Added xwayland to Dockerfile to pass mutter initfd meson checks
This commit is contained in:
parent
c08e51c9ae
commit
28a5935b71
@ -0,0 +1,21 @@
|
|||||||
|
From fa052377263464109035564b17cfa2aa76e35016 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David McKinney <mckinney@subgraph.com>
|
||||||
|
Date: Fri, 12 Feb 2021 13:53:31 +0000
|
||||||
|
Subject: [PATCH] Fix libmutter_dep in meson.build for Citadel builds
|
||||||
|
|
||||||
|
---
|
||||||
|
src/meson.build | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/src/meson.build b/src/meson.build
|
||||||
|
index e7c99ca..8fe484e 100644
|
||||||
|
--- a/src/meson.build
|
||||||
|
+++ b/src/meson.build
|
||||||
|
@@ -955,6 +955,7 @@ libmutter = shared_library(libmutter_name,
|
||||||
|
libmutter_dep = declare_dependency(
|
||||||
|
link_with: libmutter,
|
||||||
|
include_directories: mutter_includes,
|
||||||
|
+ sources: mutter_built_sources,
|
||||||
|
dependencies: [
|
||||||
|
libmutter_cogl_dep,
|
||||||
|
libmutter_clutter_dep,
|
@ -35,6 +35,7 @@ DEPENDS = " \
|
|||||||
gobject-introspection-native \
|
gobject-introspection-native \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
SRC_URI += " file://0001-Fix-libmutter_dep-in-meson.build-for-Citadel-builds.patch"
|
||||||
RDEPENDS_${PN} += " xserver-xorg-xwayland zenity"
|
RDEPENDS_${PN} += " xserver-xorg-xwayland zenity"
|
||||||
|
|
||||||
GNOMEBASEBUILDCLASS = "meson"
|
GNOMEBASEBUILDCLASS = "meson"
|
||||||
|
@ -28,7 +28,8 @@ RUN apt update && apt install -y gawk \
|
|||||||
nano \
|
nano \
|
||||||
sudo \
|
sudo \
|
||||||
debootstrap \
|
debootstrap \
|
||||||
inkscape
|
inkscape \
|
||||||
|
xwayland
|
||||||
|
|
||||||
# python
|
# python
|
||||||
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
|
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
|
||||||
|
Loading…
Reference in New Issue
Block a user