rpms/fontforge/devel fontforge-20060125-glibccrash.patch, NONE, 1.1 fontforge.spec, 1.15, 1.16

[Roozbeh Pournader (roozbeh)]

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26350

Modified Files:
	fontforge.spec 
Added Files:
	fontforge-20060125-glibccrash.patch 
Log Message:
* Sun Feb 12 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20060125-5
- Add patch to fix crash (#181052, George Williams)


fontforge-20060125-glibccrash.patch:

--- NEW FILE fontforge-20060125-glibccrash.patch ---
--- 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;


Index: fontforge.spec
===================================================================
RCS file: /cvs/extras/rpms/fontforge/devel/fontforge.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fontforge.spec	1 Feb 2006 15:56:33 -0000	1.15
+++ fontforge.spec	12 Feb 2006 20:35:26 -0000	1.16
@@ -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 @@
 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 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .glibccrash
 
 mkdir htdocs
 tar xzf %{SOURCE2} -C htdocs
@@ -108,6 +110,9 @@
 
 
 %changelog
+* Sun Feb 12 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20060125-5
+- Add patch to fix crash (#181052, George Williams)
+
 * Wed Feb 01 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20060125-4
 - Add "BuildRequires:" on libXt-devel and xorg-x11-proto-devel