grobian 14/09/07 14:46:22 Modified: gd-2.0.35-r4.ebuild ChangeLog Log: Add back font paths for as long as we don't understand why fontconfig doesn't work, bug #518970 (Portage version: 2.2.10.1-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path 1.13 media-libs/gd/gd-2.0.35-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild?r1=1.12&r2=1.13 Index: gd-2.0.35-r4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gd-2.0.35-r4.ebuild 25 Aug 2014 10:59:22 -0000 1.12 +++ gd-2.0.35-r4.ebuild 7 Sep 2014 14:46:22 -0000 1.13 @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild,v 1.12 2014/08/25 10:59:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r4.ebuild,v 1.13 2014/09/07 14:46:22 grobian Exp $ EAPI="5" -inherit autotools eutils multilib-minimal +inherit autotools eutils flag-o-matic multilib-minimal DESCRIPTION="A graphics library for fast image creation" HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"; @@ -54,6 +54,31 @@ } multilib_src_configure() { + # setup a default FONT path that has a chance of existing using corefonts, + # as to make it more useful with e.g. gnuplot + local fontpath="${EPREFIX}/usr/share/fonts/corefonts" + # like with fontconfig, try to use fonts from the host OS, because that's + # beneficial for the user + use prefix && case ${CHOST} in + *-darwin*) + fontpath+=":/Library/Fonts:/System/Library/Fonts" + ;; + *-solaris*) + [[ -d /usr/X/lib/X11/fonts/TrueType ]] && \ + fontpath+=":/usr/X/lib/X11/fonts/TrueType" + [[ -d /usr/X/lib/X11/fonts/Type1 ]] && \ + fontpath+=":/usr/X/lib/X11/fonts/Type1" + # OpenIndiana + [[ -d /usr/share/fonts/X11/Type1 ]] && \ + fontpath+=":/usr/share/fonts/X11/Type1" + ;; + *-linux-gnu) + [[ -d /usr/share/fonts/truetype ]] && \ + fontpath+=":/usr/share/fonts/truetype" + ;; + esac + append-cppflags "-DDEFAULT_FONTPATH=\\\"${fontpath}\\\"" + export ac_cv_lib_z_deflate=$(usex zlib) # we aren't actually {en,dis}abling X here ... the configure # script uses it just to add explicit -I/-L paths which we 1.101 media-libs/gd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?rev=1.101&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?rev=1.101&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gd/ChangeLog?r1=1.100&r2=1.101 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- ChangeLog 25 Aug 2014 10:59:22 -0000 1.100 +++ ChangeLog 7 Sep 2014 14:46:22 -0000 1.101 @@ -1,6 +1,10 @@ # ChangeLog for media-libs/gd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.100 2014/08/25 10:59:22 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.101 2014/09/07 14:46:22 grobian Exp $ + + 07 Sep 2014; Fabian Groffen <[email protected]> gd-2.0.35-r4.ebuild: + Add back font paths for as long as we don't understand why fontconfig doesn't + work, bug #518970 25 Aug 2014; Agostino Sarubbo <[email protected]> gd-2.0.35-r4.ebuild: Stable for alpha, wrt bug #512012
