Date: Sat, 16 Jul 2005 02:55:35 +0800 From: chinsan <chinsan.tw@gmail.com> To: MANTANI Nobutaka <nobutaka@freebsd.org> Cc: Clive Lin <clive@tongi.org>, Pav Lucistnik <pav@freebsd.org>, cvs-ports@freebsd.org, cvs-all@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/x11-fonts/libXft Makefile distinfo Message-ID: <1f27304c05071511552174dd27@mail.gmail.com> In-Reply-To: <861x5zor24.wl%nobutaka@nobutaka.org> References: <200507141313.j6EDDrox078811@repoman.freebsd.org> <86vf3cce58.wl%nobutaka@nobutaka.org> <20050715154253.GA2568@tongi.org> <861x5zor24.wl%nobutaka@nobutaka.org>
next in thread | previous in thread | raw e-mail | index | archive | help
2005/7/16, MANTANI Nobutaka <nobutaka@freebsd.org>: > At Fri, 15 Jul 2005 23:42:53 +0800, > Clive Lin wrote: > > > > Uhm, stay tuned. It's not yet proven right. Ya ... :( (sorry,cjk-patch-libXft-20050715.diff.gz was made by me) >=20 > I have found a null pointer dereference bug in the CJK patch. > It causes segmentation fault in the startup of firefox (aagh!). > The following patch fixes it. Yes! It works well for me. Thank to nobutaka for your new patch :) Could this patch be included in such as cjk-patch-libXft-20050716.diff.gz(changed filename)? >=20 >=20 > Index: Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /home/pcvs/ports/x11-fonts/libXft/Makefile,v > retrieving revision 1.32 > diff -u -r1.32 Makefile > --- Makefile 15 Jul 2005 15:40:37 -0000 1.32 > +++ Makefile 15 Jul 2005 18:25:27 -0000 > @@ -30,6 +30,7 @@ > PATCH_SITES=3D ftp://local-distfiles.freebsd.org.cn/pub/china-ports/ha= migua/ \ > http://bsdchat.com/dist/firefly-cjk-patchset/ > PATCHFILES+=3D cjk-patch-libXft-20050715.diff.gz > +EXTRA_PATCHES=3D ${PATCHDIR}/extra-patch-xftglyphs.c > .endif >=20 > .include <bsd.port.pre.mk> > Index: files/extra-patch-xftglyphs.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: files/extra-patch-xftglyphs.c > diff -N files/extra-patch-xftglyphs.c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ files/extra-patch-xftglyphs.c 15 Jul 2005 18:25:27 -0000 > @@ -0,0 +1,26 @@ > +--- xftglyphs.c.orig Sat Jul 16 02:57:30 2005 > ++++ xftglyphs.c Sat Jul 16 02:57:44 2005 > +@@ -127,6 +127,11 @@ > + if (!info) > + return; > + > ++ face =3D XftLockFace (&font->public); > ++ > ++ if (!face) > ++ return; > ++ > + /*------------------------------------------------------- > + * Add by Firefly (firefly@firefly.idv.tw) > + * Initialize gamma table > +@@ -141,11 +146,6 @@ > + if (font->info.weight >=3D FC_WEIGHT_BOLD && > + !(face->style_flags & FT_STYLE_FLAG_BOLD)) > + bold_advance_width =3D 64; > +- > +- face =3D XftLockFace (&font->public); > +- > +- if (!face) > +- return; > + > + matrix.xx =3D matrix.yy =3D 0x10000L; > + matrix.xy =3D matrix.yx =3D 0; >=20 >=20 >=20 > -- > MANTANI Nobutaka > nobutaka@nobutaka.org, nobutaka@FreeBSD.org >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1f27304c05071511552174dd27>