summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-05-07 09:56:00 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-05-07 09:58:53 +0200
commitc14efa136b56de90c59536e90a5a0cc52122dba9 (patch)
tree81e8b879708c1f373fc29feced9e23bc8b6538a3
parentprofiles/base: Set initial ENV_UNSET (EAPI 7) (diff)
downloadgentoo-c14efa136b56de90c59536e90a5a0cc52122dba9.tar.gz
gentoo-c14efa136b56de90c59536e90a5a0cc52122dba9.tar.bz2
gentoo-c14efa136b56de90c59536e90a5a0cc52122dba9.zip
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
-rw-r--r--games-rpg/adonthell/adonthell-0.3.5-r2.ebuild3
-rw-r--r--games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch21
2 files changed, 23 insertions, 1 deletions
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!])
+ )
+