diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2018-06-29 11:39:04 +0200 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2018-06-29 11:39:21 +0200 |
| commit | e226d8a9feaade6b86d586ab3524fe007e88191c (patch) | |
| tree | 5622a9ee2af60ef0c73112fc05c5db997ff0c156 /gnustep-base | |
| parent | mail-mta/msmtp: Bump to version 1.6.8 (diff) | |
| download | gentoo-e226d8a9feaade6b86d586ab3524fe007e88191c.tar.gz gentoo-e226d8a9feaade6b86d586ab3524fe007e88191c.tar.bz2 gentoo-e226d8a9feaade6b86d586ab3524fe007e88191c.zip | |
gnustep-base/mknfonts: use pkg-config to find freetype
Closes: https://bugs.gentoo.org/659374
Package-Manager: Portage-2.3.41, Repoman-2.3.9
Diffstat (limited to 'gnustep-base')
| -rw-r--r-- | gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch | 14 | ||||
| -rw-r--r-- | gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild | 31 |
2 files changed, 45 insertions, 0 deletions
diff --git a/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch b/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch new file mode 100644 index 000000000000..e73bac5c1ddf --- /dev/null +++ b/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch @@ -0,0 +1,14 @@ +diff -Naur mknfonts-0.5.orig/GNUmakefile mknfonts-0.5/GNUmakefile +--- mknfonts-0.5.orig/GNUmakefile 2002-09-28 12:27:26.000000000 +0200 ++++ mknfonts-0.5/GNUmakefile 2018-06-29 11:27:01.871588321 +0200 +@@ -9,8 +9,8 @@ + + ADDITIONAL_OBJCFLAGS += -Wall -O2 + +-ADDITIONAL_INCLUDE_DIRS += `freetype-config --cflags` +-ADDITIONAL_LDFLAGS += `freetype-config --libs` ++ADDITIONAL_INCLUDE_DIRS += `pkg-config --cflags freetype2` ++ADDITIONAL_LDFLAGS += `pkg-config --libs freetype2` + + mknfonts_OBJC_FILES = mknfonts.m + diff --git a/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild b/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild new file mode 100644 index 000000000000..af4957771143 --- /dev/null +++ b/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnustep-base + +DESCRIPTION="A tool to create .nfont packages for use with gnustep-back-art" +HOMEPAGE="https://packages.debian.org/mknfonts.tool" +SRC_URI="mirror://debian/pool/main/m/${PN}.tool/${PN}.tool_${PV}.orig.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="" + +RDEPEND="gnustep-base/gnustep-gui + >=media-libs/freetype-2.1" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-rename.patch + "${FILESDIR}"/${P}-pkgconfig.patch +) + +src_prepare() { + default + + # Correct link command for --as-needed + sed -i -e "s/ADDITIONAL_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die +} |