commit: c14efa136b56de90c59536e90a5a0cc52122dba9 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon May 7 07:56:00 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon May 7 07:58:53 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14efa13
games-rpg/adonthell: Use pkg-config to find freetype Closes: https://bugs.gentoo.org/654886 Package-Manager: Portage-2.3.36, Repoman-2.3.9 games-rpg/adonthell/adonthell-0.3.5-r2.ebuild | 3 ++- .../files/adonthell-0.3.5-freetype_pkgconfig.patch | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild index 75039371fba..883c539c216 100644 --- a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild +++ b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -40,6 +40,7 @@ PATCHES=( "${FILESDIR}"/${P}-format.patch "${FILESDIR}"/${P}-gcc46.patch "${FILESDIR}"/${P}-glibc-2.10.patch + "${FILESDIR}"/${P}-freetype_pkgconfig.patch ) pkg_setup() { diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch b/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch new file mode 100644 index 00000000000..ff11ffa96f5 --- /dev/null +++ b/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch @@ -0,0 +1,21 @@ +--- adonthell-0.3.5/configure.in ++++ adonthell-0.3.5/configure.in +@@ -17,6 +17,8 @@ + CPPFLAGS="" + DEFS="" + ++PKG_PROG_PKG_CONFIG ++ + dnl ******************** + dnl Checks for programs. + dnl ******************** +@@ -144,8 +146,7 @@ + dnl Check for FreeType2 + dnl ******************* + +-AC_CHECK_FT2(6.0.0, +- :, ++PKG_CHECK_MODULES(FT2, freetype2 >= 6.0.0,, + AC_MSG_ERROR([*** Freetype version >= 6.0.0 not found!]) + ) +
