diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2011-07-23 22:36:21 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2011-07-23 22:36:21 +0000 |
| commit | 2e480bc2b3ac14916228af7b54e16bda6449232e (patch) | |
| tree | 5ac403a6cfae59aa3d4fad4ee029d1d96e133f7b | |
| parent | Removing mask on nvidia-cuda-profiler (dropped from the tree). (diff) | |
| download | gentoo-2-2e480bc2b3ac14916228af7b54e16bda6449232e.tar.gz gentoo-2-2e480bc2b3ac14916228af7b54e16bda6449232e.tar.bz2 gentoo-2-2e480bc2b3ac14916228af7b54e16bda6449232e.zip | |
Fix bug #374203 (patch by Theofilos Intzoglou).
(Portage version: 2.1.10.7/cvs/Linux x86_64)
| -rw-r--r-- | media-gfx/splashutils/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch | 11 | ||||
| -rw-r--r-- | media-gfx/splashutils/splashutils-1.5.4.4.ebuild | 11 |
3 files changed, 25 insertions, 3 deletions
diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index 6f8874c1b8f5..fe8090c13e44 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.192 2011/06/14 21:33:32 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.193 2011/07/23 22:36:21 spock Exp $ + + 23 Jul 2011; Michał Januszewski <spock@gentoo.org> + splashutils-1.5.4.4.ebuild, +files/splashutils-1.5.4.4-freetype-bz2.patch: + Fix bug #374203 (patch by Theofilos Intzoglou). 14 Jun 2011; Michał Januszewski <spock@gentoo.org> splashutils-1.5.4.4.ebuild, +files/splashutils-1.5.4.4-gentoo-typo-fix.patch: 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 new file mode 100644 index 000000000000..50a81a3d2c0d --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch @@ -0,0 +1,11 @@ +--- 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 @@ + 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 + + CFLAGS += -I/usr/include/freetype2 diff --git a/media-gfx/splashutils/splashutils-1.5.4.4.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4.ebuild index 107da13e2464..0dae206dbd24 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.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.3 2011/07/23 22:36:21 spock Exp $ EAPI="2" @@ -35,7 +35,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" RDEPEND="gpm? ( sys-libs/gpm ) - truetype? ( >=media-libs/freetype-2 ) + truetype? ( >=media-libs/freetype-2[static-libs] ) png? ( >=media-libs/libpng-1.4.3[static-libs] ) mng? ( media-libs/lcms:0[static-libs] @@ -73,6 +73,13 @@ src_prepare() { cd "${SG}" 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 + fi + cd "${S}" ln -sf "${S}/src" "${WORKDIR}/core" |