From fa3ccf4c2a7449895449765a5a9bf9b14ac1da26 Mon Sep 17 00:00:00 2001
From: Ben Byer <bbyer@bbyer.apple.com>
Date: Thu, 13 Dec 2007 15:57:39 -0800
Subject: [PATCH] Modified X11 plist to use x11-exec (cherry picked from commit
 7d9a11329e476f45e4d9f9aebcb43469321347c7)

---
 .gitignore                                                | 1 -
 hw/xquartz/bundle/{org.x.X11.plist.in => org.x.X11.plist} | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename hw/xquartz/bundle/{org.x.X11.plist.in => org.x.X11.plist} (87%)

diff --git a/.gitignore b/.gitignore
index 37f35f46f..2e60d58b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -275,7 +275,6 @@ hw/xprint/doc/Xprt.1x
 hw/xprint/doc/Xprt.man
 hw/xprint/dpmsstubs-wrapper.c
 hw/xprint/miinitext-wrapper.c
-hw/xquartz/bundle/org.x.X11.plist
 include/dix-config.h
 include/kdrive-config.h
 include/xgl-config.h
diff --git a/hw/xquartz/bundle/org.x.X11.plist.in b/hw/xquartz/bundle/org.x.X11.plist
similarity index 87%
rename from hw/xquartz/bundle/org.x.X11.plist.in
rename to hw/xquartz/bundle/org.x.X11.plist
index 26eca968a..1e646ac63 100644
--- a/hw/xquartz/bundle/org.x.X11.plist.in
+++ b/hw/xquartz/bundle/org.x.X11.plist
@@ -6,7 +6,7 @@
 		<string>org.x.X11</string>
 	<key>ProgramArguments</key>
 		<array>
-		<string>@APPLE_APPLICATIONS_DIR@/X11.app/Contents/MacOS/X11</string>
+		<string>/usr/libexec/x11-exec</string>
 		<string>-launchd</string>
 		</array>
 	<key>Sockets</key>