From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C7BCF1381F1 for ; Mon, 7 May 2018 07:59:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCA97E07D1; Mon, 7 May 2018 07:59:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B921CE07D1 for ; Mon, 7 May 2018 07:59:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8DA07335C30 for ; Mon, 7 May 2018 07:59:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71ABA27 for ; Mon, 7 May 2018 07:59:00 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1525679933.c14efa136b56de90c59536e90a5a0cc52122dba9.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-rpg/adonthell/, games-rpg/adonthell/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-rpg/adonthell/adonthell-0.3.5-r2.ebuild games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch X-VCS-Directories: games-rpg/adonthell/ games-rpg/adonthell/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c14efa136b56de90c59536e90a5a0cc52122dba9 X-VCS-Branch: master Date: Mon, 7 May 2018 07:59:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8ef2fdd8-9f94-4c55-bb1f-a92ec6cd839f X-Archives-Hash: 748e84b86c04ad51c4134ba6a5e6e229 commit: c14efa136b56de90c59536e90a5a0cc52122dba9 Author: Lars Wendler gentoo org> AuthorDate: Mon May 7 07:56:00 2018 +0000 Commit: Lars Wendler gentoo 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!]) + ) +