#! /bin/sh /usr/share/dpatch/dpatch-run
## fix-ftbs.dpatch by Dominique Dumont <domi.dumont@free.fr>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Added a test that protect against double inclusion with recent
## DP: versions of Xlib.h provided by Xorg. The original test with X_LIB_H_
## DP: was not changed to avoid breaking build when backporting perl-tk
## DP: on older versions of Xorg.

@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' perl-tk-804.029~/pTk/Xlib.h perl-tk-804.029/pTk/Xlib.h
--- perl-tk-804.029~/pTk/Xlib.h	2007-02-10 09:55:23.000000000 +0100
+++ perl-tk-804.029/pTk/Xlib.h	2011-04-20 17:37:27.000000000 +0200
@@ -1,6 +1,7 @@
 #ifndef _XLIB
 #define _XLIB
 #ifndef _XLIB_H_
+#ifndef _X11_XLIB_H_
 extern XFontStruct *XLoadQueryFont  _ANSI_ARGS_((Display *, const char *));
 extern XModifierKeymap *XGetModifierMapping  _ANSI_ARGS_((Display *));
 extern XImage *XCreateImage  _ANSI_ARGS_((Display *, Visual *, unsigned int, int, int, char *, unsigned int, unsigned int, int, int));
@@ -143,6 +144,7 @@
 extern Window XGetSelectionOwner _ANSI_ARGS_((Display *, Atom));
 extern int XRectInRegion _ANSI_ARGS_((Region,int,int,unsigned,unsigned));
 extern int XSubtractRegion _ANSI_ARGS_((Region, Region, Region));
+#endif /* _X11_XLIB_H_ */
 #endif /* _XLIB_H_ */
 extern int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image));
 #endif /* _XLIB */