diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2009-10-10 17:54:36 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2009-10-10 17:54:36 +0000 |
| commit | 41972db8b4e545ae84d0ef3a303f5f4f5b1d3e0a (patch) | |
| tree | 9f22400cc2eb33afc49630fbdb3062397b075212 /media-gfx/fontforge | |
| parent | Merge from Prefix (diff) | |
| download | gentoo-2-41972db8b4e545ae84d0ef3a303f5f4f5b1d3e0a.tar.gz gentoo-2-41972db8b4e545ae84d0ef3a303f5f4f5b1d3e0a.tar.bz2 gentoo-2-41972db8b4e545ae84d0ef3a303f5f4f5b1d3e0a.zip | |
Build fix for bug #288444 by Mikael Magnusson.
(Portage version: 2.2_rc44/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/fontforge')
| -rw-r--r-- | media-gfx/fontforge/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/fontforge/files/fontforge-20090923-configure.patch | 26 | ||||
| -rw-r--r-- | media-gfx/fontforge/fontforge-20090923.ebuild | 11 |
3 files changed, 37 insertions, 6 deletions
diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog index 08465476117e..24d19a7acd68 100644 --- a/media-gfx/fontforge/ChangeLog +++ b/media-gfx/fontforge/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/fontforge # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.110 2009/10/09 06:22:54 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.111 2009/10/10 17:54:36 dirtyepic Exp $ + + 10 Oct 2009; Ryan Hill <dirtyepic@gentoo.org> fontforge-20090923.ebuild, + +files/fontforge-20090923-configure.patch: + Build fix for bug #288444 by Mikael Magnusson. *fontforge-20090923 (09 Oct 2009) diff --git a/media-gfx/fontforge/files/fontforge-20090923-configure.patch b/media-gfx/fontforge/files/fontforge-20090923-configure.patch new file mode 100644 index 000000000000..bcacb9fe786d --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-20090923-configure.patch @@ -0,0 +1,26 @@ +diff --git a/configure.dynamic.in b/configure.dynamic.in +index 6998825..21aeb3f 100644 +--- a/configure.dynamic.in ++++ b/configure.dynamic.in +@@ -1023,7 +1023,7 @@ if test "$gww_archlist" != "" ; then + LDFLAGS="$LDFLAGS $gww_archlist" + fi + AC_SUBST(CFLAGS_NOOPT) +-CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O2// | sed -e s/-O//` ++CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O.//g | sed -e s/-O//g` + + cp $ac_confdir/Makefile.dynamic.in $ac_confdir/Makefile.in + cp $ac_confdir/Unicode/Makefile.dynamic.in $ac_confdir/Unicode/Makefile.in +diff --git a/configure.in b/configure.in +index 6998825..21aeb3f 100644 +--- a/configure.in ++++ b/configure.in +@@ -1023,7 +1023,7 @@ if test "$gww_archlist" != "" ; then + LDFLAGS="$LDFLAGS $gww_archlist" + fi + AC_SUBST(CFLAGS_NOOPT) +-CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O2// | sed -e s/-O//` ++CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O.//g | sed -e s/-O//g` + + cp $ac_confdir/Makefile.dynamic.in $ac_confdir/Makefile.in + cp $ac_confdir/Unicode/Makefile.dynamic.in $ac_confdir/Unicode/Makefile.in diff --git a/media-gfx/fontforge/fontforge-20090923.ebuild b/media-gfx/fontforge/fontforge-20090923.ebuild index 9807be875803..482f65bffd08 100644 --- a/media-gfx/fontforge/fontforge-20090923.ebuild +++ b/media-gfx/fontforge/fontforge-20090923.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20090923.ebuild,v 1.1 2009/10/09 06:22:54 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20090923.ebuild,v 1.2 2009/10/10 17:54:36 dirtyepic Exp $ # Some notes for maintainers this package: # 1. README-unix: freetype headers are required to make use of truetype debugger @@ -15,7 +15,7 @@ EAPI=2 -inherit eutils fdo-mime +inherit autotools eutils fdo-mime HTDOCSV="20090914" CIDMAPV="20090121" @@ -55,15 +55,16 @@ src_unpack() { cd html unpack fontforge_htdocs-${HTDOCSV}.tar.bz2 fi - cd "${S}" - epatch "${FILESDIR}/fontforge-desktop.patch" } src_prepare() { + epatch "${FILESDIR}"/fontforge-desktop.patch + epatch "${FILESDIR}"/${P}-configure.patch if use doc; then - cd "${WORKDIR}/html/" + cd "${WORKDIR}"/html/ chmod -x *.html fi + eautoconf } src_configure() { |