6425513 xproto 7.0.4 -> 7.0.5
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Mon, 15 May 2006 16:54:38 -0700
changeset 18 5404abd06157
parent 17 151bef9509d4
child 19 f9bb066edfe0
6425513 xproto 7.0.4 -> 7.0.5
open-src/proto/X11/Makefile
open-src/proto/X11/Xmd.h-patch
--- a/open-src/proto/X11/Makefile	Wed May 10 18:06:31 2006 -0700
+++ b/open-src/proto/X11/Makefile	Mon May 15 16:54:38 2006 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1	06/04/11
+# @(#)Makefile	1.2	06/05/15
 #
 
 PWD:sh=pwd
@@ -38,7 +38,7 @@
 BUILD_TYPES=32 
 
 # Version number (used in path names)
-VERSION=7.0.4
+VERSION=7.0.5
 
 # Source tarball
 SOURCE_TARBALL_NAME=xproto-$(VERSION).tar.bz2
@@ -47,7 +47,7 @@
 SOURCE_URL=$(XORG_RELEASES_URL)/proto/$(SOURCE_TARBALL_NAME)
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES=	Xmd.h-patch Xos.h-patch Xpoll.h-patch X.h-patch
+SOURCE_PATCHES=	Xos.h-patch Xpoll.h-patch X.h-patch
 
 # Directory created by unpacking source
 SOURCE_DIR=$(BUILD_DIR)/xproto-$(VERSION)
--- a/open-src/proto/X11/Xmd.h-patch	Wed May 10 18:06:31 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- Xmd.h	Thu Apr  6 18:48:44 2006
-+++ Xmd.h	Thu Dec 22 09:26:38 2005
-@@ -48,10 +48,13 @@
- #ifndef XMD_H
- #define XMD_H 1
- /* $Xorg: Xmd.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-+#pragma ident "@(#)Xmd.h-patch	1.1	06/04/11 SMI"
- /*
-  *  Xmd.h: MACHINE DEPENDENT DECLARATIONS.
-  */
- 
-+#include <sys/isa_defs.h> /* SUN addition: defines _LP64 if necessary */
-+
- /*
-  * Special per-machine configuration flags.
-  */