sablink/sablink-distro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media-gfx/splashutils] add freetype patch

Browse Source
This commit is contained in:
Fabio Erculiani
2011-11-14 12:15:37 +01:00
parent c85130699d
commit f809ba02e5
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
media-gfx/splashutils/Manifest
+2 -1
View File
@@ -6,6 +6,7 @@ AUX splashutils-1.5.4.3-nondefault-runlevel.patch 894 RMD160 7c337e018858e091106
AUX splashutils-1.5.4.3-openrc-effects.patch 2261 RMD160 ad5b78025b1a2520a1b44a43f3afe1fc131ab54e SHA1 72d03fd782faf611399ea9e0217af6d6739731a8 SHA256 ea416ce53c805241b05bfff48439c4c26dbbb717001356ec08f8820ff8baec09
AUX splashutils-1.5.4.3-openrc-umount-fix.patch 1152 RMD160 a5acc1c648ca41d1aabe823c6e44aad53a1bc965 SHA1 98c6233e367a54e137ef1637725924a8a2d32871 SHA256 56f48bd31c0d405abbb2d320c131f109fcf6ee7a2ef5bed00b024dd872ef31ea
AUX splashutils-1.5.4.3-splash_geninitramfs.patch 606 RMD160 cf5b1cb43bb39acf40b761bba700a742930e91b9 SHA1 c5844ce733f3da949f12ab0cd6dc5786dba5c7e4 SHA256 9fe2d8c232a58089e902af3aebeba569669310fc1219da5d2c8775d4e10929ca
AUX splashutils-1.5.4.4-freetype-bz2.patch 515 RMD160 ed9273dd243c139f71a524d8ca969b068c8978b4 SHA1 7249f38145ac0da68d90d61a4ce711226dd67b27 SHA256 06a9f6d9d9206d09115abf3d8c86692908530f11168a51d99dd43a465e7092c0
AUX splashutils-1.5.4.4-gentoo-typo-fix.patch 567 RMD160 76f7b0d7caf56c260439a5a7655e6435259df422 SHA1 f53bce95c24e6c9d2cc8c59e0d7b37043e294fcd SHA256 92ee0727bfd9fe6f9565d09546ea63079467f67c2d57385713a62d0b617bb1bf
AUX splashutils-openrc-0.4-fix.patch 2750 RMD160 b9e7694c7e2d2083e62f321f232be9054696f06b SHA1 1d3c6c7418a0ada751dec57dff075af709f0b383 SHA256 9da0e841d23b07b262b4f49e25986dce24f73f554f25bc4219024414ccdd9846
AUX splashutils-openrc-0.4.3-runlevel-fix.patch 3472 RMD160 2e45065be3e8f670034df92a83e6c8ee9f8fb237 SHA1 a4d7bae4844070697091f84bd4a7602b8eabab26 SHA256 9e122dc031acee6996375170ae8954a0ea78cc99ba9265ab2e4ba540da25cb94
@@ -24,4 +25,4 @@ DIST splashutils-lite-1.5.4.4.tar.bz2 441340 RMD160 f67a93aa38bcbda7131c8570533a
DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
EBUILD splashutils-1.5.4.3-r2.ebuild 8043 RMD160 5a42f8f87d6e41b60ef8b5cbff4b4f4dc4509a88 SHA1 044ec62599091a714408f0301d6f20238246d060 SHA256 2525b3bc99dc68455cc7b7eef5b4b3df18ab93946cff8e1534f38199a84f0cf9
EBUILD splashutils-1.5.4.3.ebuild 7851 RMD160 266d9fa741112185cc75c452f8a2d3cd3f21b443 SHA1 503e4ae676b6d8180362f1096557aa71b387bdd7 SHA256 63a83558720438fc5813c8d03ed4706e77be4bf0a831bdb4cee9bd55140a74ed
EBUILD splashutils-1.5.4.4.ebuild 7649 RMD160 ec95d9a34fef8d43445f997472eb14667106cd5e SHA1 e0b6ba60e5e563341e45f6f0c0c2147be22376ff SHA256 9c37d141d78d9358499e38b3bf4ff1da8dcf7d48281c29707a78cf34d9a667f1
EBUILD splashutils-1.5.4.4.ebuild 7889 RMD160 f1923236085c38dd17c60885343eafa346f0761f SHA1 7c5ca97112405dc6af6ce501eab10255d4335a85 SHA256 7c0ebfd96f3339bb14aa044af45bf35e99c8fbd9a4cfd3e0c411f3591854c00f
media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch
+15
View File
@@ -0,0 +1,15 @@
=== modified file 'fbtruetype/Makefile'
--- fbtruetype/Makefile 2011-10-01 14:10:17 +0000
+++ fbtruetype/Makefile 2011-10-01 14:15:02 +0000
@@ -23,8 +23,8 @@
OBJECTS = fbtruetype.o messages.o console.o ttf.o luxisri.o
LDFLAGS += -L$(LIBDIR)
-LIBSS = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a -lm
-LIBSD = -lfreetype -lm
+LIBSS = $(shell pkg-config freetype2 --libs --static) -lm
+LIBSD = $(shell pkg-config freetype2 --libs) -lm
CFLAGS += -I/usr/include/freetype2
COMPILE = $(CC) $(CFLAGS)
media-gfx/splashutils/splashutils-1.5.4.4.ebuild
+10 -3
View File
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.2 2011/06/14 21:33:32 spock Exp $
# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.7 2011/11/13 14:53:58 maekke Exp $
EAPI="2"
@@ -33,9 +33,11 @@ SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
KEYWORDS="amd64 ~ppc x86"
RDEPEND="gpm? ( sys-libs/gpm )
truetype? ( >=media-libs/freetype-2 )
truetype? ( >=media-libs/freetype-2[static-libs]
|| ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] )
|| ( <sys-libs/zlib-1.2.5.1-r2 sys-libs/zlib[static-libs] ) )
png? ( >=media-libs/libpng-1.4.3[static-libs] )
mng? (
media-libs/lcms:0[static-libs]
@@ -73,6 +75,11 @@ src_prepare() {
cd "${SG}"
epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
if use truetype ; then
cd "${SM}"
epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
fi
cd "${S}"
ln -sf "${S}/src" "${WORKDIR}/core"