From e7d49ab59eca02037c538a544d1486987f4268bc Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 14 Sep 2011 15:02:16 +0000 Subject: Fix building with libpng15 (missing zlib.h include) wrt #378509 by Diego Elio Pettenò MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Portage version: 2.2.0_alpha55/cvs/Linux x86_64) --- app-text/pdf2html/ChangeLog | 9 ++++-- .../pdf2html/files/pdf2html-1.4-libpng15.patch | 10 +++++++ app-text/pdf2html/pdf2html-1.4.ebuild | 32 ++++++++++++---------- 3 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 app-text/pdf2html/files/pdf2html-1.4-libpng15.patch (limited to 'app-text/pdf2html') diff --git a/app-text/pdf2html/ChangeLog b/app-text/pdf2html/ChangeLog index beb61e799883..24e0d0f85631 100644 --- a/app-text/pdf2html/ChangeLog +++ b/app-text/pdf2html/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/pdf2html -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2html/ChangeLog,v 1.18 2009/12/26 19:27:30 pva Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2html/ChangeLog,v 1.19 2011/09/14 15:02:16 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen pdf2html-1.4.ebuild, + +files/pdf2html-1.4-libpng15.patch: + Fix building with libpng15 (missing zlib.h include) wrt #378509 by Diego Elio + Pettenò 26 Dec 2009; Peter Volkov pdf2html-1.4.ebuild: virtual/ghostscript->app-text/ghostscript-gpl: ghostscript-gpl is the only diff --git a/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch b/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch new file mode 100644 index 000000000000..72a0e1b65af9 --- /dev/null +++ b/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch @@ -0,0 +1,10 @@ +--- pbm2png.c ++++ pbm2png.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include /* Z_BEST_COMPRESSION */ + #include + #include + #include diff --git a/app-text/pdf2html/pdf2html-1.4.ebuild b/app-text/pdf2html/pdf2html-1.4.ebuild index 2f9f5317e945..bb06b51de3c1 100644 --- a/app-text/pdf2html/pdf2html-1.4.ebuild +++ b/app-text/pdf2html/pdf2html-1.4.ebuild @@ -1,27 +1,29 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2html/pdf2html-1.4.ebuild,v 1.18 2009/12/26 19:27:30 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/pdf2html/pdf2html-1.4.ebuild,v 1.19 2011/09/14 15:02:16 ssuominen Exp $ +EAPI=4 inherit eutils toolchain-funcs DESCRIPTION="Converts pdf files to html files" -SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/pdf2html/${P}.tgz" HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~clock/twibright/pdf2html/" -LICENSE="GPL-2" +SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/pdf2html/${P}.tgz" +LICENSE="GPL-2" +SLOT="0" KEYWORDS="alpha amd64 ~ppc sparc x86" IUSE="" -SLOT="0" -DEPEND=">=media-libs/libpng-1.2.5" +DEPEND=">=media-libs/libpng-1.4 + sys-libs/zlib" RDEPEND="${DEPEND} app-text/ghostscript-gpl - >=media-gfx/imagemagick-5.4.9" + >=media-gfx/imagemagick-6" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-gentoo.patch" +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-gentoo.patch \ + "${FILESDIR}"/${P}-libpng15.patch } src_compile() { @@ -29,18 +31,18 @@ src_compile() { # Rewrite the Makefile as that's simpler echo "LDLIBS=-lpng" > Makefile echo "all: pbm2png" >> Makefile - emake || die "failed to compile pbm2png" + emake echo "pbm2eps9: pbm2eps9.o printer.o" > Makefile - emake pbm2eps9 || die "failed to compile pbm2eps9" + emake pbm2eps9 echo "cp /usr/share/${P}/*.png ." >> pdf2html } src_install() { - dobin pbm2png pbm2eps9 pdf2html ps2eps9 || die "install failed" + dobin pbm2png pbm2eps9 pdf2html ps2eps9 insinto /usr/share/${P} doins *.png *.html - dodoc CHANGELOG README VERSION || die "install failed" + dodoc CHANGELOG README VERSION } -- cgit v1.2.3-65-gdbad