dist-git conversion

#2781)

.gitignore

@@ -1,2 +1,2 @@
-fontforge_full-20061019.tar.bz2
 fontforge_htdocs-20061014.tar.bz2
+fontforge_full-20061025.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: fontforge
-# $Id$
-NAME := fontforge
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

fontforge-20060125-glibccrash.patch

@@ -1,13 +0,0 @@
---- 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;

fontforge-20061025-fsSel.patch

@@ -0,0 +1,11 @@
+--- fontforge-20061025/fontforge/tottf.c.fsSel	2006-12-09 21:36:24.000000000 +0330
++++ fontforge-20061025/fontforge/tottf.c	2006-12-09 21:41:45.000000000 +0330
+@@ -3090,7 +3090,7 @@
+     os2->fsSel = (at->head.macstyle&1?32:0)|(at->head.macstyle&2?1:0);
+     if ( sf->fullname!=NULL && strstrmatch(sf->fullname,"outline")!=NULL )
+ 	os2->fsSel |= 8;
+-    if ( os2->fsSel==0 ) os2->fsSel = 64;		/* Regular */
++    if ( os2->fsSel==0 && sf->pfminfo.weight == 400) os2->fsSel = 64;		/* Regular */
+     if ( os2->version>=4 ) {
+ 	if ( strstrmatch(sf->fontname,"Obli")==0 ) {
+ 	    os2->fsSel &= ~1;		/* Turn off Italic */

fontforge-20061025-usFirstCharIndex.patch

@@ -0,0 +1,10 @@
+--- fontforge-20061025/fontforge/tottf.c.usFirstCharIndex	2006-10-05 07:29:12.000000000 +0330
++++ fontforge-20061025/fontforge/tottf.c	2006-11-25 13:59:52.000000000 +0330
+@@ -3187,7 +3187,6 @@
+ 	os2->firstcharindex = 0xf000 + first;	/* This gets mapped to space */
+ 	os2->lastcharindex  = 0xf000 + last;
+     } else {
+-	if ( first>13 && format!=ff_otf && format!=ff_otfcid ) first = 13;	/* We give the font an extra char mapped to cr (13) */
+ 	os2->firstcharindex = first;
+ 	os2->lastcharindex = last;
+ 	OS2FigureCodePages(sf, os2->ulCodePage);

fontforge.spec

@@ -2,8 +2,8 @@
 %define gettext_package FontForge
 
 Name:           fontforge
-Version:        20061019
-Release:        1%{?dist}
+Version:        20061025
+Release:        2%{?dist}
 Summary:        Outline and bitmap font editor
 
 Group:          Applications/Publishing
@@ -12,6 +12,8 @@ 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}.tar.bz2
+Patch1:         fontforge-20061025-usFirstCharIndex.patch
+Patch2:         fontforge-20061025-fsSel.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       htmlview
@@ -39,6 +41,8 @@ fonts. It supports a range of font formats, including PostScript
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .usFirstCharIndex
+%patch2 -p1 -b .fsSel
 
 mkdir htdocs
 tar xjf %{SOURCE2} -C htdocs
@@ -112,6 +116,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 09 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 20061025-2
+- Add patch to fix fsSelection problem with DejaVu ExtraLight
+
+* Sat Nov 25 2006 Roozbeh Pournader <roozbeh@farsiweb.info> - 20061025-1
+- Update to 20061025
+- Patch to correct usFirstCharIndex (George Williams)
+
 * Fri Oct 20 2006 Kevin Fenzi <kevin@tummy.com> - 20061019-1
 - Update to 20061019
 

sources

@@ -1,2 +1,2 @@
-17cfd54612f3956397029945d008870e  fontforge_full-20061019.tar.bz2
 c55c948e1475d2f772aba96704e4b779  fontforge_htdocs-20061014.tar.bz2
+5fcfa3497d237bf68d1d388254f78448  fontforge_full-20061025.tar.bz2