From 15a413e11d186a9206a39a9b2fe4b72c065d5918 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon, 22 Feb 2021 23:02:42 -0800
Subject: [PATCH] xquartz: Update meson build to remove deleted files

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
 hw/xquartz/bundle/meson.build | 8 +++-----
 hw/xquartz/meson.build        | 2 --
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/hw/xquartz/bundle/meson.build b/hw/xquartz/bundle/meson.build
index ec5225293..28f171c70 100644
--- a/hw/xquartz/bundle/meson.build
+++ b/hw/xquartz/bundle/meson.build
@@ -1,9 +1,7 @@
-# system-wide Xquartz server defaults file
-install_data('Xquartz.plist',
-    install_dir: join_paths(get_option('libdir'), 'X11/xserver'))
-
 # generate Info.plist
-cpp = find_program('cpp')
+# https://github.com/mesonbuild/meson/issues/8434
+#cpp = find_program('cpp')
+cpp = '/usr/bin/cpp'
 cpp_defs = [
     '-DAPPLE_APPLICATION_NAME=@0@'.format(apple_application_name),
     '-DBUNDLE_ID_PREFIX=@0@'.format(bundle_id_prefix),
diff --git a/hw/xquartz/meson.build b/hw/xquartz/meson.build
index d1c5f8a51..9e321b059 100644
--- a/hw/xquartz/meson.build
+++ b/hw/xquartz/meson.build
@@ -28,11 +28,9 @@ srcs_libxquartz = [
     'darwinXinput.c',
     'keysym2ucs.c',
     'quartz.c',
-    'quartzCocoa.m',
     'quartzKeyboard.c',
     'quartzStartup.c',
     'quartzRandR.c',
-    'console_redirect.c',
     '../../mi/miinitext.c',
     '../../mi/miinitext.h',
 ]