perl/perl-tk: Added a patch to fix building with new xorg in 13.37.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
This commit is contained in:
dsomero 2011-03-24 20:58:38 -04:00
parent edf08cbd08
commit 195d1cef7b
3 changed files with 25 additions and 2 deletions

View file

@ -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 */

View file

@ -6,7 +6,7 @@
PRGNAM=perl-tk PRGNAM=perl-tk
VERSION=${VERSION:-804.029} VERSION=${VERSION:-804.029}
BUILD=${BUILD:-1} BUILD=${BUILD:-2}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
@ -52,7 +52,11 @@ find . \
-exec chmod 644 {} \; -exec chmod 644 {} \;
# Apply a few patches # Apply a few patches
patch -p1 < $CWD/$PRGNAM-$VERSION.diff patch -p1 < $CWD/patches/$PRGNAM-$VERSION.diff
# Fix build failure with libX11-1.4.0 where they added an "X11_" string to
# header guards to avoid possible collision.
patch -p1 < $CWD/patches/804.029-X11_XLIB_H.patch
# XFT=1 (font manager) support, which gives perl-tk programs the ability to # XFT=1 (font manager) support, which gives perl-tk programs the ability to
# use all fonts accessible from XFT and antialiasing. # use all fonts accessible from XFT and antialiasing.