xserver: Branch 'xorg-server-1.2-apple' - 2 commits

[Jeremy Huddleston]

 configure.ac                 |    4 ++--
 hw/xquartz/bundle/Info.plist |    2 +-
 hw/xquartz/xpr/Makefile.am   |    1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit a41c3561242d0086e82e96cbe8a108a18a6a3f05
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Apr 19 23:31:20 2008 -0700

    XQuartz: 1.3.0-apple17

diff --git a/configure.ac b/configure.ac
index 38281b5..6a59d00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.3.0-apple16, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.3.0-apple17, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
diff --git a/hw/xquartz/bundle/Info.plist b/hw/xquartz/bundle/Info.plist
index 6ba02dd..4d1ae54 100644
--- a/hw/xquartz/bundle/Info.plist
+++ b/hw/xquartz/bundle/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 		<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-		<string>2.2.0</string>
+		<string>2.2.1</string>
 	<key>CFBundleSignature</key>
 		<string>x11a</string>
 	<key>CSResourcesFileMapped</key>
commit 8f920fca6f9149185649d52569d33bf81b6c6857
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Apr 19 23:31:05 2008 -0700

    XQuartz: Cleanup turning off COMPOSITE

diff --git a/configure.ac b/configure.ac
index 560a9fe..38281b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -630,7 +630,7 @@ dnl XQuartz DDX Detection... Yes, it's ugly to have it here... but we need to di
 if test "x$COMPOSITE" = xauto; then
 	case $host_os in
 		darwin*)
-			[ "x$XQUARTZ" = xyes -o "x$XQUARTZ" = xauto ] && COMPOSITE=no
+			test "x$XQUARTZ" = xyes -o "x$XQUARTZ" = xauto && COMPOSITE=no
 			;;
 	esac
 fi
diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
index 666759a..36e9171 100644
--- a/hw/xquartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -29,7 +29,6 @@ Xquartz_LDADD = \
 	$(top_builddir)/damageext/libdamageext.la \
 	$(top_builddir)/miext/damage/libdamage.la \
 	$(top_builddir)/xfixes/libxfixes.la \
-	$(top_builddir)/miext/cw/libcw.la \
 	$(top_builddir)/Xext/libXext.la \
 	$(top_builddir)/xkb/libxkb.la \
 	$(top_builddir)/xkb/libxkbstubs.la \