diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-04-09 17:46:19 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-04-09 17:46:19 +0000 |
commit | d51ce238616f3427191f0d541d596bcb7c7f13be (patch) | |
tree | 1400dd5bbe387fefa000e28b819971fc7ec80aae /media-gfx/fontforge | |
parent | arm/ia64/s390/sh love (diff) | |
download | gentoo-2-d51ce238616f3427191f0d541d596bcb7c7f13be.tar.gz gentoo-2-d51ce238616f3427191f0d541d596bcb7c7f13be.tar.bz2 gentoo-2-d51ce238616f3427191f0d541d596bcb7c7f13be.zip |
Version bump #125752 by Beech Horn et al and fix by Thomas Holder for #127723.
(Portage version: 2.1_pre7-r4)
Diffstat (limited to 'media-gfx/fontforge')
-rw-r--r-- | media-gfx/fontforge/ChangeLog | 8 | ||||
-rw-r--r-- | media-gfx/fontforge/files/digest-fontforge-20060406 | 3 | ||||
-rw-r--r-- | media-gfx/fontforge/files/fontforge-20060406-respect-HOME.patch | 106 | ||||
-rw-r--r-- | media-gfx/fontforge/fontforge-20060406.ebuild | 47 |
4 files changed, 163 insertions, 1 deletions
diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog index 0c49bfd027cc..0ed0045edb68 100644 --- a/media-gfx/fontforge/ChangeLog +++ b/media-gfx/fontforge/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/fontforge # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.25 2006/01/10 18:49:51 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.26 2006/04/09 17:46:19 vapier Exp $ + +*fontforge-20060406 (09 Apr 2006) + + 09 Apr 2006; Mike Frysinger <vapier@gentoo.org> + +files/fontforge-20060406-respect-HOME.patch, +fontforge-20060406.ebuild: + Version bump #125752 by Beech Horn et al and fix by Thomas Holder for #127723. 10 Jan 2006; Michael Hanselmann <hansmi@gentoo.org> fontforge-20050624.ebuild: diff --git a/media-gfx/fontforge/files/digest-fontforge-20060406 b/media-gfx/fontforge/files/digest-fontforge-20060406 new file mode 100644 index 000000000000..1750f02e0f5a --- /dev/null +++ b/media-gfx/fontforge/files/digest-fontforge-20060406 @@ -0,0 +1,3 @@ +MD5 33aabad96a007b90679c392807e6eb7d fontforge_full-20060406.tar.bz2 3168350 +RMD160 7e8c3445f2b105d215b2ebce8e1a1df866397dad fontforge_full-20060406.tar.bz2 3168350 +SHA256 2dd9083bd7c3044e24595a272434919ed2f150b773a31fdac08d747c331703b0 fontforge_full-20060406.tar.bz2 3168350 diff --git a/media-gfx/fontforge/files/fontforge-20060406-respect-HOME.patch b/media-gfx/fontforge/files/fontforge-20060406-respect-HOME.patch new file mode 100644 index 000000000000..016a8ac53684 --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-20060406-respect-HOME.patch @@ -0,0 +1,106 @@ +--- fontforge/diffstubs.c ++++ fontforge/diffstubs.c +@@ -1070,12 +1070,13 @@ return( dir = g_get_home_dir()); + # include <pwd.h> + + static char *gethomedir(void) { +- static char *dir=NULL; ++ static char *dir; + int uid; + struct passwd *pw; + ++ dir = getenv("HOME"); + if ( dir!=NULL ) +-return( dir ); ++return( strdup(dir) ); + + uid = getuid(); + while ( (pw=getpwent())!=NULL ) { +@@ -1087,21 +1088,17 @@ return( dir ); + } + endpwent(); + +- if ( (dir=getenv("HOME"))!=NULL ) +-return( (dir=strdup(dir)) ); +- + return( NULL ); + } + #endif + + char *getPfaEditDir(char *buffer) { +- static char *dir=NULL; ++ char *dir=gethomedir(); + +- if ( dir!=NULL ) +-return( dir ); +- if ( gethomedir()==NULL ) ++ if ( dir==NULL ) + return( NULL ); +- sprintf(buffer,"%s/.PfaEdit", gethomedir()); ++ sprintf(buffer,"%s/.PfaEdit", dir); ++ free(dir); + if ( access(buffer,F_OK)==-1 ) + if ( mkdir(buffer,0700)==-1 ) + return( NULL ); +--- fontforge/autosave.c ++++ fontforge/autosave.c +@@ -48,12 +48,13 @@ return( dir = g_get_home_dir()); + # include <pwd.h> + + static char *gethomedir(void) { +- static char *dir=NULL; ++ static char *dir; + int uid; + struct passwd *pw; + ++ dir = getenv("HOME"); + if ( dir!=NULL ) +-return( dir ); ++return( strdup(dir) ); + + uid = getuid(); + while ( (pw=getpwent())!=NULL ) { +@@ -65,21 +66,17 @@ return( dir ); + } + endpwent(); + +- if ( (dir=getenv("HOME"))!=NULL ) +-return( (dir=strdup(dir)) ); +- + return( NULL ); + } + #endif + + char *getPfaEditDir(char *buffer) { +- static char *dir=NULL; ++ char *dir=gethomedir(); + +- if ( dir!=NULL ) +-return( dir ); +- if ( gethomedir()==NULL ) ++ if ( dir==NULL ) + return( NULL ); +- sprintf(buffer,"%s/.PfaEdit", gethomedir()); ++ sprintf(buffer,"%s/.PfaEdit", dir); ++ free(dir); + if ( access(buffer,F_OK)==-1 ) + if ( mkdir(buffer,0700)==-1 ) + return( NULL ); +@@ -88,13 +85,12 @@ return( dir ); + } + + static char *getAutoDirName(char *buffer) { +- static char *dir=NULL; ++ char *dir=getPfaEditDir(buffer); + +- if ( dir!=NULL ) +-return( dir ); +- if ( getPfaEditDir(buffer)==NULL ) ++ if ( dir==NULL ) + return( NULL ); +- sprintf(buffer,"%s/autosave", getPfaEditDir(buffer)); ++ sprintf(buffer,"%s/autosave", dir); ++ free(dir); + if ( access(buffer,F_OK)==-1 ) + if ( mkdir(buffer,0700)==-1 ) + return( NULL ); diff --git a/media-gfx/fontforge/fontforge-20060406.ebuild b/media-gfx/fontforge/fontforge-20060406.ebuild new file mode 100644 index 000000000000..1bb333c104d5 --- /dev/null +++ b/media-gfx/fontforge/fontforge-20060406.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20060406.ebuild,v 1.1 2006/04/09 17:46:19 vapier Exp $ + +inherit flag-o-matic eutils + +DESCRIPTION="postscript font editor and converter" +HOMEPAGE="http://fontforge.sourceforge.net/" +SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc-macos ~sparc ~x86" +IUSE="png gif jpeg tiff truetype svg unicode X" + +DEPEND="png? ( >=media-libs/libpng-1.2.4 ) + gif? ( >=media-libs/giflib-4.1.0-r1 ) + jpeg? ( >=media-libs/jpeg-6b-r2 ) + tiff? ( >=media-libs/tiff-3.5.7-r1 ) + truetype? ( >=media-libs/freetype-2.1.4 ) + svg? ( >=dev-libs/libxml2-2.6.7 ) + unicode? ( >=media-libs/libuninameslist-030713 ) + !media-gfx/pfaedit" + +src_unpack() { + unpack ${A} + cd "${S}" + sed -i -e 's:ungif:gif:g' configure* || die + sed -i -e 's:"libungif":"libgif":g' gdraw/gimagereadgif.c || die + epatch "${FILESDIR}"/${P}-respect-HOME.patch +} + +src_compile() { + filter-mfpmath "sse" "387" + + econf \ + --with-multilayer \ + --without-freetype-src \ + $(use_with X x) \ + || die "econf failed" + make || die +} + +src_install() { + einstall || die + dodoc AUTHORS README* +} |