xserver: Branch 'server-21.1-branch'

[GitLab Mirror]

 hw/xquartz/Makefile.am         |    3 +++
 hw/xquartz/bundle/Makefile.am  |    3 ---
 hw/xquartz/pbproxy/Makefile.am |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6bb98fc62ddf8b0dd90f7b0b45978a0d0425ed5a
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Tue Jun 21 11:46:14 2022 -0700

    xquartz: Update autotools-based builds of XQuartz to account for recent changes
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index bcc6dabfe..222f3b1d4 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -3,6 +3,7 @@ AM_CFLAGS = $(DIX_CFLAGS)
 AM_OBJCFLAGS = $(DIX_CFLAGS)
 AM_CPPFLAGS = \
 	-DXSERVER_VERSION=\"$(VERSION)\" \
+	-DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\" \
 	-DUSE_NEW_CLUT \
 	-DXFree86Server \
 	-I$(top_srcdir)/miext/rootless \
@@ -21,6 +22,7 @@ DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup man
 libXquartz_la_SOURCES = \
 	$(top_srcdir)/mi/miinitext.c \
 	$(top_srcdir)/mi/miinitext.h \
+	NSUserDefaults+XQuartzDefaults.m \
 	X11Application.m \
 	X11Controller.m \
 	applewm.c \
@@ -36,6 +38,7 @@ libXquartz_la_SOURCES = \
 libXquartz_la_LIBADD = $(top_builddir)/pseudoramiX/libPseudoramiX.la
 
 EXTRA_DIST = \
+	NSUserDefaults+XQuartzDefaults.h \
 	X11Application.h \
 	X11Controller.h \
 	applewmExt.h \
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index d97de1e71..01b7afaca 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -23,9 +23,6 @@ noinst_DATA = $(noinst_PRE:plist.cpp=plist)
 
 CLEANFILES = $(noinst_DATA)
 
-resourcedir=$(libdir)/X11/xserver
-resource_DATA = Xquartz.plist
-
 EXTRA_DIST = \
 	mk_bundke.sh \
 	X11.sh \
diff --git a/hw/xquartz/pbproxy/Makefile.am b/hw/xquartz/pbproxy/Makefile.am
index 9429ea25d..3314855d7 100644
--- a/hw/xquartz/pbproxy/Makefile.am
+++ b/hw/xquartz/pbproxy/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS=-DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\"
+AM_CPPFLAGS=-I..
 
 AM_CFLAGS=$(XPBPROXY_CFLAGS)
 AM_OBJCFLAGS=$(XPBPROXY_CFLAGS)
@@ -15,7 +15,7 @@ libxpbproxy_la_LDFLAGS=$(XPBPROXY_LIBS)
 if STANDALONE_XPBPROXY
 
 bin_PROGRAMS = xpbproxy
-xpbproxy_SOURCES = app-main.m
+xpbproxy_SOURCES = app-main.m ../NSUserDefaults+XQuartzDefaults.m
 xpbproxy_LDADD = libxpbproxy.la
 xpbproxy_LDFLAGS = -Wl,-framework,Cocoa