From 0757d01739139f4063623bc2d7d6c2dc8e5610d5 Mon Sep 17 00:00:00 2001 From: reed Date: Thu, 10 Aug 2006 14:51:39 +0000 Subject: Fix PR #34087. Patch from Gilles Dauphin. On Solaris 10, /usr/openwin/include/X11/Xutil.h does not include Xlib.h. It does have the comment: /* You must include before including this file */ This means that Xlib.h doesn't pull in X.h and Pixmap and other items are not defined. With some other versions of X, the X11/Xutil.h header does include X11/Xlib.h itself so this problem is not seen. --- x11/xscreensaver/distinfo | 3 ++- x11/xscreensaver/patches/patch-ah | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 x11/xscreensaver/patches/patch-ah (limited to 'x11') diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index d4b4a7f13b0..74a44a84bd4 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.49 2006/07/18 18:40:36 wiz Exp $ +$NetBSD: distinfo,v 1.50 2006/08/10 14:51:39 reed Exp $ SHA1 (xscreensaver-5.00.tar.gz) = 631eb0414112b2db2e62e2ab5a984726d61696d2 RMD160 (xscreensaver-5.00.tar.gz) = 7630ff42cfd24557cf1459902ddc6256004fc938 @@ -10,3 +10,4 @@ SHA1 (patch-ad) = 5d0e3fe79d0161897cf945ca4f2a2178342d3ba5 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3 SHA1 (patch-ag) = e4f2332a349a94162f057601a69498a171ad4114 +SHA1 (patch-ah) = e998a9ee7f5928c6eb652deb847a0655bb6da562 diff --git a/x11/xscreensaver/patches/patch-ah b/x11/xscreensaver/patches/patch-ah new file mode 100644 index 00000000000..9261d8115dd --- /dev/null +++ b/x11/xscreensaver/patches/patch-ah @@ -0,0 +1,12 @@ +$NetBSD: patch-ah,v 1.5 2006/08/10 14:51:39 reed Exp $ + +--- hacks/apple2-main.c.orig 2006-08-10 09:32:10.000000000 -0500 ++++ hacks/apple2-main.c 2006-08-10 09:32:31.000000000 -0500 +@@ -27,6 +27,7 @@ + #ifndef HAVE_COCOA + # define XK_MISCELLANY + # include ++# include + # include + # include + #endif -- cgit v1.2.3