diff options
| -rw-r--r-- | dev-perl/perl-tk/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-perl/perl-tk/files/804.029-X11_XLIB_H.patch | 19 | ||||
| -rw-r--r-- | dev-perl/perl-tk/perl-tk-804.029.ebuild | 5 |
3 files changed, 28 insertions, 3 deletions
diff --git a/dev-perl/perl-tk/ChangeLog b/dev-perl/perl-tk/ChangeLog index 4cc205f4d59e..74d7370385ad 100644 --- a/dev-perl/perl-tk/ChangeLog +++ b/dev-perl/perl-tk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-perl/perl-tk # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.77 2010/11/07 21:25:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/ChangeLog,v 1.78 2010/11/27 07:09:07 tove Exp $ + + 27 Nov 2010; Torsten Veller <tove@gentoo.org> + +files/804.029-X11_XLIB_H.patch, perl-tk-804.029.ebuild: + Fix build failure with libX11-1.4.0 where they added an "X11_" string to + header guards to avoid possible collision (#345987) 07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> perl-tk-804.028-r2.ebuild, perl-tk-804.029.ebuild: 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 */ diff --git a/dev-perl/perl-tk/perl-tk-804.029.ebuild b/dev-perl/perl-tk/perl-tk-804.029.ebuild index 2a30055552ec..843405edd3d9 100644 --- a/dev-perl/perl-tk/perl-tk-804.029.ebuild +++ b/dev-perl/perl-tk/perl-tk-804.029.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/perl-tk-804.029.ebuild,v 1.9 2010/11/07 21:25:51 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/perl-tk/perl-tk-804.029.ebuild,v 1.10 2010/11/27 07:09:07 tove Exp $ EAPI=3 @@ -28,7 +28,8 @@ S=${WORKDIR}/${MY_P} SRC_TEST="skip" PATCHES=( "${FILESDIR}"/xorg.patch - "${FILESDIR}"/804.028-path.patch ) + "${FILESDIR}"/804.028-path.patch + "${FILESDIR}"/804.029-X11_XLIB_H.patch ) # "${FILESDIR}"/${PN}-804.027-interix-x11.patch ) myconf="X11ROOT=${EPREFIX}/usr XFT=1 -I${EPREFIX}/usr/include/ -l${EPREFIX}/usr/$(get_libdir)" |