rpms/fontforge/FC-4 fontforge-20060125-glibccrash.patch, NONE, 1.1 fontforge.spec, 1.13, 1.14 fontforge-20040618-docview.patch, 1.1, NONE

[Roozbeh Pournader (roozbeh)]

Author: roozbeh

Update of /cvs/extras/rpms/fontforge/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3754

Modified Files:
	fontforge.spec 
Added Files:
	fontforge-20060125-glibccrash.patch 
Removed Files:
	fontforge-20040618-docview.patch 
Log Message:
* Sat Feb 18 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20060125-2
- 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/FC-4/fontforge.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fontforge.spec	1 Feb 2006 11:51:49 -0000	1.13
+++ fontforge.spec	18 Feb 2006 16:32:01 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           fontforge
 Version:        20060125
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -12,9 +12,11 @@
 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
+
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  libpng-devel
@@ -24,6 +26,7 @@
 BuildRequires:  XFree86-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libuninameslist-devel
+
 Obsoletes:      pfaedit
 Provides:       pfaedit
 
@@ -35,6 +38,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .glibccrash
 
 mkdir htdocs
 tar xzf %{SOURCE2} -C htdocs
@@ -105,6 +109,9 @@
 
 
 %changelog
+* Sat Feb 18 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20060125-2
+- Add patch to fix crash (#181052, George Williams)
+
 * Wed Feb 01 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 20060125-1
 - Update to 20060125 (bug #170177)
 - Update docs to 20060114


--- fontforge-20040618-docview.patch DELETED ---