From 628b04bacb5cd9409026d346694d22f1807bacd9 Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Sun, 6 Apr 2003 20:37:06 +0000
Subject: Fix a segfault that can occur when mixing RENDER and non-RENDER
 fonts.

Obtained from:	XFree86 CVS
---
 x11-fonts/Xft/Makefile              |  2 +-
 x11-fonts/Xft/files/patch-xftdraw.c | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 x11-fonts/Xft/files/patch-xftdraw.c

(limited to 'x11-fonts/Xft')

diff --git a/x11-fonts/Xft/Makefile b/x11-fonts/Xft/Makefile
index 8a9027590dd9..d84dff6988eb 100644
--- a/x11-fonts/Xft/Makefile
+++ b/x11-fonts/Xft/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Xft
 PORTVERSION=	2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/fontconfig/release/
 DISTNAME=	fcpackage.${PORTVERSION:S/./_/}
diff --git a/x11-fonts/Xft/files/patch-xftdraw.c b/x11-fonts/Xft/files/patch-xftdraw.c
new file mode 100644
index 000000000000..564de234962b
--- /dev/null
+++ b/x11-fonts/Xft/files/patch-xftdraw.c
@@ -0,0 +1,20 @@
+--- xftdraw.c	2002/10/11 17:53:02	1.25
++++ xftdraw.c	2003/04/03 22:25:50	1.26
+@@ -724,7 +724,7 @@ XftDrawGlyphFontSpec (XftDraw			*draw,
+ 	    {
+ 		XftGlyphFontSpecRender (draw->dpy, _XftDrawOp (draw, color),
+ 					src, draw->render.pict,
+-					0, 0, glyphs, i - start);
++					0, 0, glyphs + start , i - start);
+ 	    }
+ 	}
+ 	else
+@@ -732,7 +732,7 @@ XftDrawGlyphFontSpec (XftDraw			*draw,
+ 	    while (i < len && !((XftFontInt *) glyphs[i].font)->format)
+ 		i++;
+ 	    if (_XftDrawCorePrepare (draw, color))
+-		XftGlyphFontSpecCore (draw, color, glyphs, len);
++		XftGlyphFontSpecCore (draw, color, glyphs + start, i - start);
+ 	}
+     }
+ }
-- 
cgit