diff options
| author |   Torsten Veller <tove@gentoo.org> | 2010-11-27 07:09:07 +0000 |
|---|---|---|
| committer | Torsten Veller <tove@gentoo.org> | 2010-11-27 07:09:07 +0000 |
| commit | 4ff8afa181a1ef6207e5010518153b29a86db735 (patch) | |
| tree | 99b404d0aad6e1b28f226b3152e1de29febe2e2d /dev-perl/perl-tk/files | |
| parent | Version bumped, bug #301795. Removed old versions and unused files, bug #342539. (diff) | |
| download | gentoo-2-4ff8afa181a1ef6207e5010518153b29a86db735.tar.gz gentoo-2-4ff8afa181a1ef6207e5010518153b29a86db735.tar.bz2 gentoo-2-4ff8afa181a1ef6207e5010518153b29a86db735.zip | |
Fix build failure with libX11-1.4.0 where they added an "X11_" string to header guards to avoid possible collision (#345987)
(Portage version: 2.2.0_alpha5/cvs/Linux x86_64)
Diffstat (limited to 'dev-perl/perl-tk/files')
| -rw-r--r-- | dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch b/dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch new file mode 100644 index 000000000000..7a43a7ade866 --- /dev/null +++ b/dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/show_bug.cgi?id=345987 +--- Tk-804.029/pTk/Xlib.h ++++ Tk-804.029/pTk/Xlib.h +@@ -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 */ |