head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.6
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.4
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.2
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.1.0.10
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.8
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.6
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.4
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.2
	pkgsrc-2010Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2011.10.06.15.50.39;	author dholland;	state dead;
branches;
next	1.1;

1.1
date	2010.07.11.23.51.16;	author dholland;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Roll all the pkgsrc patches (of which there were far too many, and
none pkgsrc-specific) into a distfile jumbo patch. Sort the PLIST.

While this is not supposed to change the resulting package, bump the
PKGREVISION as a precaution and to make sure the build with the patch
gets tested properly.
@
text
@$NetBSD: patch-eg,v 1.1 2010/07/11 23:51:16 dholland Exp $

Fix build with recent xextproto, where the shape extension prototypes
appear to have been moved to their own header file.

--- server/shape.c~	1997-09-27 21:10:13.000000000 +0000
+++ server/shape.c
@@@@ -33,6 +33,7 @@@@
 #include <X11/Xutil.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/shape.h>
+#include <X11/extensions/shapeproto.h>
 #include "xmx.h"
 #include "ptc.h"
 #include "incl/shape.pvt.h"
@


1.1
log
@Fix build with recent xextproto.
@
text
@d1 1
a1 1
$NetBSD$
@