diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2008-03-13 01:09:51 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2008-03-13 01:09:51 +0000 |
| commit | a54171dfdeb03341ec6445d5a6f2132e987301ef (patch) | |
| tree | 65d5a470ecc96b507df7527b30d358eb1004e656 /media-gfx/fontforge | |
| parent | amd64 stable, bug #212653 (diff) | |
| download | gentoo-2-a54171dfdeb03341ec6445d5a6f2132e987301ef.tar.gz gentoo-2-a54171dfdeb03341ec6445d5a6f2132e987301ef.tar.bz2 gentoo-2-a54171dfdeb03341ec6445d5a6f2132e987301ef.zip | |
Add patch from upstream and Ed Catmur to fix segfault when generating fonts
containing a symbol cmap. Bug #212715.
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-gfx/fontforge')
| -rw-r--r-- | media-gfx/fontforge/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/fontforge/files/fontforge-20080302-bad-apple.patch | 18 | ||||
| -rw-r--r-- | media-gfx/fontforge/fontforge-20080302.ebuild | 6 |
3 files changed, 29 insertions, 2 deletions
diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog index dc9b076011b3..a0231fd7ae6a 100644 --- a/media-gfx/fontforge/ChangeLog +++ b/media-gfx/fontforge/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/fontforge # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.76 2008/03/08 11:44:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.77 2008/03/13 01:09:50 dirtyepic Exp $ + + 13 Mar 2008; Ryan Hill <dirtyepic@gentoo.org> + +files/fontforge-20080302-bad-apple.patch, fontforge-20080302.ebuild: + Add patch from upstream and Ed Catmur to fix segfault when generating fonts + containing a symbol cmap. Bug #212715. *fontforge-20080302 (08 Mar 2008) diff --git a/media-gfx/fontforge/files/fontforge-20080302-bad-apple.patch b/media-gfx/fontforge/files/fontforge-20080302-bad-apple.patch new file mode 100644 index 000000000000..bd3caad0e535 --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-20080302-bad-apple.patch @@ -0,0 +1,18 @@ +diff -Naurp fontforge-20080302-orig/fontforge/tottf.c fontforge-20080302/fontforge/tottf.c +--- fontforge-20080302-orig/fontforge/tottf.c 2008-02-29 16:35:14.000000000 -0600 ++++ fontforge-20080302/fontforge/tottf.c 2008-03-12 18:30:12.000000000 -0600 +@@ -4718,12 +4718,13 @@ static void dumpcmap(struct alltabs *at, + } + + format4 = NeedsUCS2Table(sf,&ucs2len,map,modformat==ff_ttfsym); ++ apple2 = NULL; + if ( modformat!=ff_ttfsym ) { + format12 = NeedsUCS4Table(sf,&ucs4len,map); + format2 = Needs816Enc(sf,&cjklen,map,&apple2,&applecjklen); + format14 = NeedsVariationSequenceTable(sf,&vslen,map); + } else +- format12 = format2 = format14 = NULL; ++ format12 = format2 = format14 = apple2 = NULL; + + /* Two/Three/Four encoding table pointers, one for ms, one for mac */ + /* usually one for mac big, just a copy of ms */ diff --git a/media-gfx/fontforge/fontforge-20080302.ebuild b/media-gfx/fontforge/fontforge-20080302.ebuild index 9efe76ac6cd2..1ab220b3b30c 100644 --- a/media-gfx/fontforge/fontforge-20080302.ebuild +++ b/media-gfx/fontforge/fontforge-20080302.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080302.ebuild,v 1.1 2008/03/08 11:44:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20080302.ebuild,v 1.2 2008/03/13 01:09:50 dirtyepic Exp $ + +inherit eutils DESCRIPTION="postscript font editor and converter" HOMEPAGE="http://fontforge.sourceforge.net/" @@ -28,6 +30,8 @@ src_unpack() { unpack ${A} cd "${S}" sed -i '3i#undef X_DISPLAY_MISSING' inc/config.h.in || die #205455 + + epatch "${FILESDIR}"/${P}-bad-apple.patch #212715 } src_compile() { |