games-rpg/adonthell: Use pkg-config to find freetype
authorLars Wendler <polynomial-c@gentoo.org>
Mon, 7 May 2018 07:56:00 +0000 (09:56 +0200)
committerLars Wendler <polynomial-c@gentoo.org>
Mon, 7 May 2018 07:58:53 +0000 (09:58 +0200)
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
games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch [new file with mode: 0644]

index 75039371fbabb74db4ffd405fc8e55bbaf43e987..883c539c2161b25f44eab0a577ba69f0e378529d 100644 (file)
@@ -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 (file)
index 0000000..ff11ffa
--- /dev/null
@@ -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!])
+ )
+