From owner-cvs-all@FreeBSD.ORG Fri Jul 15 18:36:00 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4359316A421; Fri, 15 Jul 2005 18:36:00 +0000 (GMT) (envelope-from nobutaka@nobutaka.org) Received: from media-w.com (media-w.com [204.202.15.129]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6E5A43D5C; Fri, 15 Jul 2005 18:35:58 +0000 (GMT) (envelope-from nobutaka@nobutaka.org) Received: from bullet.internal.nobutaka.org (j069090.ppp.asahi-net.or.jp [61.213.69.90]) (authenticated bits=0) by media-w.com (8.13.1/8.13.1) with ESMTP id j6FIZuPP084007; Sat, 16 Jul 2005 03:35:57 +0900 (JST) Date: Sat, 16 Jul 2005 03:35:47 +0900 Message-ID: <861x5zor24.wl%nobutaka@nobutaka.org> From: MANTANI Nobutaka To: Clive Lin In-Reply-To: <20050715154253.GA2568@tongi.org> References: <200507141313.j6EDDrox078811@repoman.freebsd.org> <86vf3cce58.wl%nobutaka@nobutaka.org> <20050715154253.GA2568@tongi.org> User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/21.3 (i386--freebsd) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Cc: MANTANI Nobutaka , cvs-all@FreeBSD.org, ports-committers@FreeBSD.org, Pav Lucistnik , chinsan , cvs-ports@FreeBSD.org Subject: Re: cvs commit: ports/x11-fonts/libXft Makefile distinfo X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jul 2005 18:36:00 -0000 At Fri, 15 Jul 2005 23:42:53 +0800, Clive Lin wrote: > > Uhm, stay tuned. It's not yet proven right. 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. Index: Makefile =================================================================== 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= ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \ http://bsdchat.com/dist/firefly-cjk-patchset/ PATCHFILES+= cjk-patch-libXft-20050715.diff.gz +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-xftglyphs.c .endif .include Index: files/extra-patch-xftglyphs.c =================================================================== 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 = XftLockFace (&font->public); ++ ++ if (!face) ++ return; ++ + /*------------------------------------------------------- + * Add by Firefly (firefly@firefly.idv.tw) + * Initialize gamma table +@@ -141,11 +146,6 @@ + if (font->info.weight >= FC_WEIGHT_BOLD && + !(face->style_flags & FT_STYLE_FLAG_BOLD)) + bold_advance_width = 64; +- +- face = XftLockFace (&font->public); +- +- if (!face) +- return; + + matrix.xx = matrix.yy = 0x10000L; + matrix.xy = matrix.yx = 0; -- MANTANI Nobutaka nobutaka@nobutaka.org, nobutaka@FreeBSD.org