xserver: Branch 'master'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Mon Dec 10 20:37:54 PST 2007
hw/xquartz/bundle/Makefile.am | 3 +++
hw/xquartz/bundle/Xquartz.plist | 27 +++++++++++++++++++++++++++
hw/xquartz/bundle/org.x.X11.plist.in | 2 --
hw/xquartz/xpr/Makefile.am | 1 -
4 files changed, 30 insertions(+), 3 deletions(-)
New commits:
commit 7d61893b49569a72bccb63f1ae8c9ce4ef4e354f
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date: Mon Dec 10 20:33:30 2007 -0800
Xquartz: Removed Xplugin.h from EXTRA_DIST
(cherry picked from commit a746383eca77c9b9ea2cba0cf1c8fc39c0f7d536)
diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index e8d5167..5734434 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -15,6 +15,9 @@ endif
clean-local:
rm -rf build
+resourcedir=$(libdir)/X11/xserver
+resource_DATA = Xquartz.plist
+
EXTRA_DIST = \
org.x.X11.plist \
Info.plist \
diff --git a/hw/xquartz/bundle/Xquartz.plist b/hw/xquartz/bundle/Xquartz.plist
new file mode 100644
index 0000000..e157045
--- /dev/null
+++ b/hw/xquartz/bundle/Xquartz.plist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+
+<!-- This file contains system-wide defaults for the Apple X11 server -->
+
+<plist version="1.0">
+<dict>
+ <key>apps_menu</key>
+ <array>
+ <array>
+ <string>Terminal</string>
+ <string>xterm</string>
+ <string>n</string>
+ </array>
+ <array>
+ <string>xman</string>
+ <string>xman</string>
+ <string></string>
+ </array>
+ <array>
+ <string>xlogo</string>
+ <string>xlogo</string>
+ <string></string>
+ </array>
+ </array>
+</dict>
+</plist>
diff --git a/hw/xquartz/bundle/org.x.X11.plist.in b/hw/xquartz/bundle/org.x.X11.plist.in
index 36849cf..26eca96 100644
--- a/hw/xquartz/bundle/org.x.X11.plist.in
+++ b/hw/xquartz/bundle/org.x.X11.plist.in
@@ -4,8 +4,6 @@
<dict>
<key>Label</key>
<string>org.x.X11</string>
- <key>Program</key>
- <string>@APPLE_APPLICATIONS_DIR@/X11.app/Contents/MacOS/X11</string>
<key>ProgramArguments</key>
<array>
<string>@APPLE_APPLICATIONS_DIR@/X11.app/Contents/MacOS/X11</string>
diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
index c2419ca..87ed195 100644
--- a/hw/xquartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -67,5 +67,4 @@ EXTRA_DIST = \
x-hash.h \
x-hook.h \
x-list.h \
- Xplugin.h \
xpr.h
More information about the xorg-commit
mailing list