summaryrefslogtreecommitdiff
path: root/x11-fonts
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-04-06 20:37:06 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-04-06 20:37:06 +0000
commit300ef054203794d45b06534a2eee68e313cc0ecf (patch)
tree2a6d86c1ca3b0100ae786ed0deecbb513ad0ef6a /x11-fonts
parentUnbreak by updating to 1.0.11 (diff)
Fix a segfault that can occur when mixing RENDER and non-RENDER fonts.
Obtained from: XFree86 CVS
Notes
Notes: svn path=/head/; revision=78452
Diffstat (limited to 'x11-fonts')
-rw-r--r--x11-fonts/Xft/Makefile2
-rw-r--r--x11-fonts/Xft/files/patch-xftdraw.c20
-rw-r--r--x11-fonts/libXft/Makefile2
-rw-r--r--x11-fonts/libXft/files/patch-xftdraw.c20
4 files changed, 42 insertions, 2 deletions
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);
+ }
+ }
+ }
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index 8a9027590dd9..d84dff6988eb 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/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/libXft/files/patch-xftdraw.c b/x11-fonts/libXft/files/patch-xftdraw.c
new file mode 100644
index 000000000000..564de234962b
--- /dev/null
+++ b/x11-fonts/libXft/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);
+ }
+ }
+ }