From ab0b6c53595cbdd09376103090c982d27f55980f Mon Sep 17 00:00:00 2001 From: Roozbeh Pournader Date: Feb 12 2006 20:35:26 +0000 Subject: - Add patch to fix crash (#181052, George Williams) --- diff --git a/fontforge-20060125-glibccrash.patch b/fontforge-20060125-glibccrash.patch new file mode 100644 index 0000000..6be476d --- /dev/null +++ b/fontforge-20060125-glibccrash.patch @@ -0,0 +1,13 @@ +--- fontforge-20060125/fontforge/charview.c.glibccrash 2006-01-15 09:38:57.000000000 +0330 ++++ fontforge-20060125/fontforge/charview.c 2006-02-12 23:49:58.000000000 +0330 +@@ -2803,8 +2803,8 @@ + ss->first->prev->from->nextcpindex = pnum++; + for ( sp=ss->first; ; ) { + if ( (sp->ttfindex==0xffff || +- ( !sp->nonextcp && !sp->noprevcp && +- !sp->roundx && !sp->roundy && !sp->dontinterpolate )) && ++ ( !sp->roundx && !sp->roundy && !sp->dontinterpolate )) && ++ !sp->nonextcp && !sp->noprevcp && + RealWithin((sp->nextcp.x+sp->prevcp.x)/2, sp->me.x,.1) && + RealWithin((sp->nextcp.y+sp->prevcp.y)/2, sp->me.y,.1) ) + sp->ttfindex = 0xffff; diff --git a/fontforge.spec b/fontforge.spec index 138465d..81be324 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -3,7 +3,7 @@ Name: fontforge Version: 20060125 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Outline and bitmap font editor Group: Applications/Publishing @@ -12,6 +12,7 @@ URL: http://fontforge.sourceforge.net/ Source0: http://dl.sf.net/fontforge/fontforge_full-%{version}.tar.bz2 Source1: fontforge.desktop Source2: http://dl.sf.net/fontforge/fontforge_htdocs-%{docs_version}.tgz +Patch1: fontforge-20060125-glibccrash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: htmlview @@ -38,6 +39,7 @@ fonts. It supports a range of font formats, including PostScript %prep %setup -q -n %{name}-%{version} +%patch1 -p1 -b .glibccrash mkdir htdocs tar xzf %{SOURCE2} -C htdocs @@ -108,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 12 2006 Roozbeh Pournader - 20060125-5 +- Add patch to fix crash (#181052, George Williams) + * Wed Feb 01 2006 Roozbeh Pournader - 20060125-4 - Add "BuildRequires:" on libXt-devel and xorg-x11-proto-devel