summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2014-10-08 06:24:24 +0000
committerJeroen Roovers <jer@gentoo.org>2014-10-08 06:24:24 +0000
commit8d2acaf5cec4a24bf2ff502a3ddcd17e5e9be9b2 (patch)
treee817ae03a63df50d20d381897666133b8fa3ce73 /x11-misc
parentVersion bump, bug#524740, cleanup (diff)
downloadgentoo-2-8d2acaf5cec4a24bf2ff502a3ddcd17e5e9be9b2.tar.gz
gentoo-2-8d2acaf5cec4a24bf2ff502a3ddcd17e5e9be9b2.tar.bz2
gentoo-2-8d2acaf5cec4a24bf2ff502a3ddcd17e5e9be9b2.zip
Fix building against newer media-libs/freetype by Matthew Ogilvie (bug #514800).
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xfe/ChangeLog6
-rw-r--r--x11-misc/xfe/xfe-1.37.ebuild8
2 files changed, 11 insertions, 3 deletions
diff --git a/x11-misc/xfe/ChangeLog b/x11-misc/xfe/ChangeLog
index 31be0e195887..5733834b987a 100644
--- a/x11-misc/xfe/ChangeLog
+++ b/x11-misc/xfe/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/xfe
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.96 2014/02/26 14:37:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.97 2014/10/08 06:24:24 jer Exp $
+
+ 08 Oct 2014; Jeroen Roovers <jer@gentoo.org> xfe-1.37.ebuild:
+ Fix building against newer media-libs/freetype by Matthew Ogilvie (bug
+ #514800).
*xfe-1.37 (26 Feb 2014)
diff --git a/x11-misc/xfe/xfe-1.37.ebuild b/x11-misc/xfe/xfe-1.37.ebuild
index 3a7482eb78d0..a3b00b0dd715 100644
--- a/x11-misc/xfe/xfe-1.37.ebuild
+++ b/x11-misc/xfe/xfe-1.37.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.37.ebuild,v 1.1 2014/02/26 14:37:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.37.ebuild,v 1.2 2014/10/08 06:24:24 jer Exp $
EAPI=5
@@ -62,7 +62,11 @@ src_prepare() {
rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;}
l10n_for_each_disabled_locale_do rm_locale
- sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
+ sed -i \
+ -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
+ -e 's|freetype/config/ftheader.h|ft2build.h|' \
+ configure.ac || die
+
eautoreconf
}