| 1 |
tove 10/11/27 07:09:07 |
| 2 |
|
| 3 |
Added: 804.029-X11_XLIB_H.patch |
| 4 |
Log: |
| 5 |
Fix build failure with libX11-1.4.0 where they added an "X11_" string to header guards to avoid possible collision (#345987) |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha5/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 804.029-X11_XLIB_H.patch |
| 16 |
=================================================================== |
| 17 |
https://bugs.gentoo.org/show_bug.cgi?id=345987 |
| 18 |
--- Tk-804.029/pTk/Xlib.h |
| 19 |
+++ Tk-804.029/pTk/Xlib.h |
| 20 |
@@ -1,6 +1,7 @@ |
| 21 |
#ifndef _XLIB |
| 22 |
#define _XLIB |
| 23 |
#ifndef _XLIB_H_ |
| 24 |
+#ifndef _X11_XLIB_H_ |
| 25 |
extern XFontStruct *XLoadQueryFont _ANSI_ARGS_((Display *, const char *)); |
| 26 |
extern XModifierKeymap *XGetModifierMapping _ANSI_ARGS_((Display *)); |
| 27 |
extern XImage *XCreateImage _ANSI_ARGS_((Display *, Visual *, unsigned int, int, int, char *, unsigned int, unsigned int, int, int)); |
| 28 |
@@ -143,6 +144,7 @@ |
| 29 |
extern Window XGetSelectionOwner _ANSI_ARGS_((Display *, Atom)); |
| 30 |
extern int XRectInRegion _ANSI_ARGS_((Region,int,int,unsigned,unsigned)); |
| 31 |
extern int XSubtractRegion _ANSI_ARGS_((Region, Region, Region)); |
| 32 |
+#endif /* _X11_XLIB_H_ */ |
| 33 |
#endif /* _XLIB_H_ */ |
| 34 |
extern int _XInitImageFuncPtrs _ANSI_ARGS_((XImage *image)); |
| 35 |
#endif /* _XLIB */ |
Archives