diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-11-23 13:36:01 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-11-23 13:36:01 +0000 |
| commit | e9a816195f1f6cc6dcde98183564a1241c8a1e34 (patch) | |
| tree | 039dfa156c307773f743a1b2b24a4608e02d645a | |
| parent | 6915d59bcfba473c2f382537cdb15e939ca2ceef (diff) | |
There's a bug in XFree86-4's XCreateFontSet(), revealed by 5-current's
default AJ /etc/malloc.conf behaviour. It can't auto-match CJK fontnames
specified in its fontset argument, but only explicit fontnames are accepted.
Submitted by: keith
Tested by: Clive Lin <clive@CirX.ORG>, Michael C. Wu <keichii@iteration.net>
| -rw-r--r-- | x11/XFree86-4/Makefile | 2 | ||||
| -rw-r--r-- | x11/XFree86-4/files/patch-q | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile index 7792076bc5ec..70886f951377 100644 --- a/x11/XFree86-4/Makefile +++ b/x11/XFree86-4/Makefile @@ -7,7 +7,7 @@ PORTNAME= XFree86 PORTVERSION= 4.0.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} diff --git a/x11/XFree86-4/files/patch-q b/x11/XFree86-4/files/patch-q new file mode 100644 index 000000000000..cb083b8a8d79 --- /dev/null +++ b/x11/XFree86-4/files/patch-q @@ -0,0 +1,19 @@ +--- lib/X11/omGeneric.c.orig Mon Oct 16 17:01:11 2000 ++++ lib/X11/omGeneric.c Mon Oct 16 19:57:59 2000 +@@ -1128,6 +1128,7 @@ + (sizeof(VRotateRec) * sub_num); + if(font_set->vrotate == (VRotate)NULL) + return (-1); ++ memset(vrotate, '\0', sizeof(VRotateRec) * sub_num); + + for(i = 0 ; i < sub_num ; i++) { + vrotate[i].charset_name = font_set->substitute[i].name; +@@ -1137,7 +1138,7 @@ + } + vrotate_num = font_set->vrotate_num = sub_num; + } else { +- font_set->vrotate = (VRotate)NULL; ++ vrotate = font_set->vrotate = (VRotate)NULL; + } + + ret = parse_fontdata(oc, font_set, (FontData) vrotate, vrotate_num, |