gnustep-base/mknfonts: respect ${PKG_CONFIG}, depend on pkgconfig
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
parent
91c5d43d7e
commit
e4c922278a
|
@ -1,14 +1,13 @@
|
|||
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
|
||||
--- a/GNUmakefile
|
||||
+++ b/GNUmakefile
|
||||
@@ -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`
|
||||
+ADDITIONAL_INCLUDE_DIRS += `${PKG_CONFIG} --cflags freetype2`
|
||||
+ADDITIONAL_LDFLAGS += `${PKG_CONFIG} --libs freetype2`
|
||||
|
||||
mknfonts_OBJC_FILES = mknfonts.m
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
--- mknfonts-0.5/mknfonts.m.orig 2007-05-03 11:46:27.000000000 +0200
|
||||
+++ mknfonts-0.5/mknfonts.m 2007-05-03 11:47:34.000000000 +0200
|
||||
--- a/mknfonts.m
|
||||
+++ b/mknfonts.m
|
||||
@@ -310,12 +310,6 @@
|
||||
{
|
||||
fi=[faceinfos objectAtIndex: i];
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit gnustep-base
|
||||
inherit gnustep-base toolchain-funcs
|
||||
|
||||
DESCRIPTION="A tool to create .nfont packages for use with gnustep-back-art"
|
||||
HOMEPAGE="https://packages.debian.org/mknfonts.tool"
|
||||
|
@ -15,8 +15,8 @@ IUSE=""
|
|||
|
||||
RDEPEND="gnustep-base/gnustep-gui
|
||||
>=media-libs/freetype-2.1"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-rename.patch
|
||||
|
@ -26,6 +26,8 @@ PATCHES=(
|
|||
src_prepare() {
|
||||
default
|
||||
|
||||
tc-export PKG_CONFIG
|
||||
|
||||
# Correct link command for --as-needed
|
||||
sed -i -e "s/ADDITIONAL_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue