This commit is contained in:
parent
d89b8d33e5
commit
2345623d21
@ -1,13 +0,0 @@
|
||||
diff -ru fontforge-20061014.orig/fontforge/freetype.c fontforge-20061014/fontforge/freetype.c
|
||||
--- fontforge-20061014.orig/fontforge/freetype.c 2006-09-29 05:21:35.000000000 +0200
|
||||
+++ fontforge-20061014/fontforge/freetype.c 2006-11-17 19:52:36.000000000 +0100
|
||||
@@ -1098,8 +1098,8 @@
|
||||
bitmap.pixel_mode = ft_pixel_mode_grays;
|
||||
}
|
||||
bitmap.buffer = gcalloc(bitmap.pitch*bitmap.rows,sizeof(uint8));
|
||||
-#ifdef FONTFORGE_CONFIG_TYPE3
|
||||
memset(&temp,0,sizeof(temp));
|
||||
+#ifdef FONTFORGE_CONFIG_TYPE3
|
||||
if ( sc->parent->multilayer && !(sc->layer_cnt==1 &&
|
||||
!sc->layers[ly_fore].dostroke &&
|
||||
sc->layers[ly_fore].dofill &&
|
@ -1,12 +0,0 @@
|
||||
diff -ru fontforge-20061025/fontforge/parsepfa.c fontforge-20061025.new/fontforge/parsepfa.c
|
||||
--- fontforge-20061025/fontforge/parsepfa.c 2006-08-27 06:44:49.000000000 +0200
|
||||
+++ fontforge-20061025.new/fontforge/parsepfa.c 2006-12-19 19:53:06.000000000 +0100
|
||||
@@ -1327,7 +1327,7 @@
|
||||
char *pt;
|
||||
int instring = false, firstnibble=true, sofar=0, nibble;
|
||||
int complained = false;
|
||||
- int ch;
|
||||
+ int ch = 0;
|
||||
|
||||
fp->sfnts = tmpfile();
|
||||
|
12
bugzilla-231126-array-subscript-out-of-range.patch
Normal file
12
bugzilla-231126-array-subscript-out-of-range.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ru fontforge-20061220/fontforge/displayfonts.c fontforge-20061220.new/fontforge/displayfonts.c
|
||||
--- fontforge-20061220/fontforge/displayfonts.c 2006-11-19 22:03:11.000000000 +0100
|
||||
+++ fontforge-20061220.new/fontforge/displayfonts.c 2007-01-03 12:25:54.000000000 +0100
|
||||
@@ -469,7 +469,7 @@
|
||||
void DisplayDlg(SplineFont *sf) {
|
||||
GRect pos;
|
||||
GWindowAttrs wattrs;
|
||||
- GGadgetCreateData gcd[15], boxes[5], *harray[8], *farray[6], *barray[4], *varray[9];
|
||||
+ GGadgetCreateData gcd[15], boxes[5], *harray[8], *farray[7], *barray[4], *varray[9];
|
||||
GTextInfo label[15];
|
||||
DI di;
|
||||
char buf[10];
|
@ -1,11 +0,0 @@
|
||||
--- fontforge/combinations.c
|
||||
+++ fontforge/combinations.c
|
||||
@@ -642,7 +642,7 @@
|
||||
else
|
||||
sprintf( buffer, "%d,%d ", kern->newoff, kern->newyoff );
|
||||
if ( kern->ac!=NULL )
|
||||
- strncat(buffer,kern->ac->name,sizeof(buffer));
|
||||
+ strncat(buffer,kern->ac->name,sizeof(buffer)-strlen(buffer)-1);
|
||||
GDrawDrawText8(pixmap,15,subclip.y+kpd->uh-kpd->fh+kpd->as,buffer,-1,NULL,
|
||||
kern->kp!=NULL && kern->newoff!=kern->kp->off ? 0xff0000 : 0x000000 );
|
||||
if ( i+kpd->off_top==kpd->selected ) {
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 03 11:43:21 CET 2007 - mfabian@suse.de
|
||||
|
||||
- update to 20061220.
|
||||
- remove fontforge-strncat.patch,
|
||||
bugzilla-221210-locale-variable-used-before-set.patch,
|
||||
bugzilla-225616-local-variable-used-before-set.patch
|
||||
(included upstream).
|
||||
- fix bugzilla #231126: "array subscript out of range".
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 19 18:40:01 CET 2006 - mfabian@suse.de
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package fontforge (Version 20061025)
|
||||
# spec file for package fontforge (Version 20061220)
|
||||
#
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
@ -21,19 +21,17 @@ Group: Productivity/Graphics/Vector Editors
|
||||
Autoreqprov: on
|
||||
Obsoletes: PfaEdit
|
||||
Provides: PfaEdit
|
||||
Version: 20061025
|
||||
Version: 20061220
|
||||
Release: 1
|
||||
URL: http://fontforge.sourceforge.net/
|
||||
Source0: http://ovh.dl.sourceforge.net/sourceforge/fontforge/fontforge_full-20061025.tar.bz2
|
||||
Source1: http://belnet.dl.sourceforge.net/sourceforge/fontforge/fontforge_htdocs-20061014.tar.bz2
|
||||
Source0: fontforge_full-20061220.tar.bz2
|
||||
Source1: fontforge_htdocs-20061220.tar.bz2
|
||||
Source2: http://belnet.dl.sourceforge.net/sourceforge/fontforge/fontforge_ja_htdocs-20060822.tar.bz2
|
||||
Source10: %{name}.desktop
|
||||
Source11: %name.png
|
||||
Patch0: docdir.patch
|
||||
Patch2: invalid-operation-same-variable-used-twice.patch
|
||||
Patch3: fontforge-strncat.patch
|
||||
Patch4: bugzilla-221210-locale-variable-used-before-set.patch
|
||||
Patch5: bugzilla-225616-local-variable-used-before-set.patch
|
||||
Patch3: bugzilla-231126-array-subscript-out-of-range.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildPreReq: libjpeg libtiff libpng libungif
|
||||
Summary: A Font Editor
|
||||
@ -56,11 +54,9 @@ Authors:
|
||||
%setup -q -T -n fontforge-%{version} -b 0
|
||||
%patch0 -p 1 -b .docdir
|
||||
%patch2 -p 1
|
||||
%patch3
|
||||
%patch4 -p 1
|
||||
%patch5 -p 1
|
||||
%patch3 -p 1
|
||||
mkdir docs
|
||||
tar jxvf $RPM_SOURCE_DIR/fontforge_htdocs-20061014.tar.bz2 -C docs
|
||||
tar jxvf $RPM_SOURCE_DIR/fontforge_htdocs-%{version}.tar.bz2 -C docs
|
||||
tar jxvf $RPM_SOURCE_DIR/fontforge_ja_htdocs-20060822.tar.bz2 -C docs
|
||||
tar zxvf docs/cidmaps.tgz
|
||||
find . -name "*.html" -o -name "*.png" | xargs chmod 644
|
||||
@ -114,6 +110,13 @@ install -m644 $RPM_SOURCE_DIR/%name.png $RPM_BUILD_ROOT%_datadir/pixmaps/%name.p
|
||||
%endif
|
||||
|
||||
%changelog -n fontforge
|
||||
* Wed Jan 03 2007 - mfabian@suse.de
|
||||
- update to 20061220.
|
||||
- remove fontforge-strncat.patch,
|
||||
bugzilla-221210-locale-variable-used-before-set.patch,
|
||||
bugzilla-225616-local-variable-used-before-set.patch
|
||||
(included upstream).
|
||||
- fix bugzilla #231126: "array subscript out of range".
|
||||
* Tue Dec 19 2006 - mfabian@suse.de
|
||||
- update to 20061025.
|
||||
• fontimage program has been added.
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c7c7aab8d5c21876eb2e3eff88428b47642ad99b87f5d6583c1d05a316a5f993
|
||||
size 3599810
|
3
fontforge_full-20061220.tar.bz2
Normal file
3
fontforge_full-20061220.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0d715043e30395795e65d91a2ca81ad1552da24153e704927d591a746d856887
|
||||
size 3664186
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ed0dc2a3373aad43bd4e9930cf7afaa3efd66166e2dcf2ddaf99727988d384f4
|
||||
size 2211882
|
3
fontforge_htdocs-20061220.tar.bz2
Normal file
3
fontforge_htdocs-20061220.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:425a09f4dcb800e464dc18987e4e8bd81d99766f2d852ae947013d4e44184251
|
||||
size 2308221
|
Loading…
Reference in New Issue
Block a user