diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-30 08:49:38 +0100 |
| commit | b2be182d49eea46686b5cf2680d457df61e89dc4 (patch) | |
| tree | c66442ced2011c5ca81c3114cc51041e314c6d33 /gnustep-base | |
| parent | e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff) | |
gentoo resync : 30.06.2018
Diffstat (limited to 'gnustep-base')
| -rw-r--r-- | gnustep-base/Manifest.gz | bin | 1718 -> 1719 bytes | |||
| -rw-r--r-- | gnustep-base/mknfonts/Manifest | 2 | ||||
| -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 |
4 files changed, 47 insertions, 0 deletions
diff --git a/gnustep-base/Manifest.gz b/gnustep-base/Manifest.gz Binary files differindex 6981a1592f0c..ae30c203367b 100644 --- a/gnustep-base/Manifest.gz +++ b/gnustep-base/Manifest.gz diff --git a/gnustep-base/mknfonts/Manifest b/gnustep-base/mknfonts/Manifest index d4b08ee116a6..270e0c841b26 100644 --- a/gnustep-base/mknfonts/Manifest +++ b/gnustep-base/mknfonts/Manifest @@ -1,4 +1,6 @@ +AUX mknfonts-0.5-pkgconfig.patch 510 BLAKE2B b74790dbad72f52c0075114861ecbb66a428c41cda8510252e41611a57a16eaff34461f18d87659bce469167e28d75bcfe20fdf5b5419acb2b5d12416236f506 SHA512 c45b6eb60365cb6b0125127cfaf9292756a5f6490249f5fa5be600054ec4743f84bd1c56e9d199441e74de829a4ebf63241c4aae5e13a64af449a1ec4ba6a00f AUX mknfonts-rename.patch 499 BLAKE2B 50430871a2f4a99bf1c4996291dadacf1bf6cbd296b1ae5ef25d896a7d48d034ea2fbfc91f5f490661d0ba3c5b87ead5794a4402104e670c090ac654c117c5c0 SHA512 9107b0e6de1d228bce2e4796dd69a65a5644ca290dbe7c2953f44576d5485204bb52659895302e243d2f92bb3dbdf33991cbfa62a59d2486914b62a8e4675f7f DIST mknfonts.tool_0.5.orig.tar.gz 2890 BLAKE2B 584989b90c0fb44d62f69174e0dca706a8bcfab942442228ae4e5c98dfb8221e9bfc43cb32b4f48609b51ff7217f591f2d7acaccf219a2ed34b99fb9f5ea2f4e SHA512 a6ad5810576285f16a8dc3596205b64bc6b183a6b9377df1c9e40d28cdba7ce2ae6e6b883478429f8c931bdd3f9f23396c6f5cd3fa1d155025638bb77ccd86ed EBUILD mknfonts-0.5-r2.ebuild 739 BLAKE2B 8ab135c1c469b872477d59f2692ad42ef8297c7955fc4c2ebba1e9667804a63bc6212fe65777b91ce88b8d6a2dfab4d155c5f28176d125815e6d9b6672ef8614 SHA512 69da2c1eaaa4ac84be7d0ee8f2a168895ef28ebf02b4f7f44a36e59bef2552133950120c350e6ca5eb72ee82171f27d483b9183851717422c13642e198abb6ba +EBUILD mknfonts-0.5-r3.ebuild 787 BLAKE2B d700765e5b44ee42c607435db7e0d2c4c807668f18d6fbaaa1d0f03d8873309a41a10642c22f5865fa6824c5833a785a6676125b8c28884ee6e172c01f9fdcbc SHA512 dd962aac428abca33a4797a6b4a5f61e15b9014a54928744f297057f5bd482a16422b64479e88fe1abbd6dfee23eaaab77d26fa21b11455c942ffed5333dd79d MISC metadata.xml 386 BLAKE2B 9e51e731459b36cc9d7b65926248bd40c8e8461659b126cf302101221043916d50de5240435e8ec1fa242f63ecd0c8e628c24f45c9228c0019edd3b2e6db8668 SHA512 de1d2ee898b37b1ae1d2d2763d13275bb9c733065588ec367f5505ff3a027f3ee965ec02b7c3709ce7946b9afe3860a02933a12e57064fe6f30ee51c7455a533 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 +} |