diff options
| author |   Peter Volkov <pva@gentoo.org> | 2011-10-18 12:59:32 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2011-10-18 12:59:32 +0000 |
| commit | 680d9d6c8168ecf35f8e466f33d8e689f403c0ba (patch) | |
| tree | 227f0fd4f24cbfabae3f665e78aff469ee983ffc /media-gfx/splashutils | |
| parent | Version bump, fixes vulnerability vulnerabilities in handling Type 1, securit... (diff) | |
| download | gentoo-2-680d9d6c8168ecf35f8e466f33d8e689f403c0ba.tar.gz gentoo-2-680d9d6c8168ecf35f8e466f33d8e689f403c0ba.tar.bz2 gentoo-2-680d9d6c8168ecf35f8e466f33d8e689f403c0ba.zip | |
Fixed build failure reported in bug 384131 wrt Robin Johnson.
(Portage version: 2.1.10.27/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/splashutils')
| -rw-r--r-- | media-gfx/splashutils/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch | 14 | ||||
| -rw-r--r-- | media-gfx/splashutils/splashutils-1.5.4.4.ebuild | 11 |
3 files changed, 19 insertions, 12 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index 669fb9f1849d..a4bb04115e08 100644 --- a/media-gfx/splashutils/ChangeLog +++ b/media-gfx/splashutils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/splashutils # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.195 2011/09/04 14:13:19 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.196 2011/10/18 12:59:32 pva Exp $ + + 18 Oct 2011; Peter Volkov <pva@gentoo.org> splashutils-1.5.4.4.ebuild, + files/splashutils-1.5.4.4-freetype-bz2.patch: + Fixed build failure reported in bug 384131 wrt Robin Johnson. 04 Sep 2011; Michał Januszewski <spock@gentoo.org> splashutils-1.5.4.3-r3.ebuild: diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch index 50a81a3d2c0d..3438fd523b2a 100644 --- a/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch +++ b/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch @@ -1,11 +1,15 @@ ---- fbtruetype/Makefile.old 2011-07-12 16:57:03.110616657 +0300 -+++ fbtruetype/Makefile 2011-07-12 16:48:31.656254788 +0300 -@@ -23,7 +23,7 @@ +=== 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 -+LIBSS = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a $(LIBDIR)/libbz2.a -lm - LIBSD = -lfreetype -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) + diff --git a/media-gfx/splashutils/splashutils-1.5.4.4.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4.ebuild index 979277c7c160..d9ed44655c0a 100644 --- a/media-gfx/splashutils/splashutils-1.5.4.4.ebuild +++ b/media-gfx/splashutils/splashutils-1.5.4.4.ebuild @@ -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.4 2011/08/28 17:48:30 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.5 2011/10/18 12:59:32 pva Exp $ EAPI="2" @@ -36,7 +36,8 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" RDEPEND="gpm? ( sys-libs/gpm ) truetype? ( >=media-libs/freetype-2[static-libs] - || ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[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] @@ -75,10 +76,8 @@ src_prepare() { epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch" if use truetype ; then - if [[ "`freetype-config --ftversion`" > "2.4.4" ]]; then - cd "${SM}" - epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch" - fi + cd "${SM}" + epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch" fi cd "${S}" |