From 25990b8859525d1dcfec28908d9a54cd55c8d933 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 Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64 --- app-text/pdf2html/ChangeLog | 9 ++++-- app-text/pdf2html/Manifest | 15 ++++++++-- .../pdf2html/files/pdf2html-1.4-libpng15.patch | 10 +++++++ app-text/pdf2html/pdf2html-1.4.ebuild | 32 ++++++++++++---------- 4 files changed, 47 insertions(+), 19 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/Manifest b/app-text/pdf2html/Manifest index 5b48de10d68f..5bbe49b4c373 100644 --- a/app-text/pdf2html/Manifest +++ b/app-text/pdf2html/Manifest @@ -1,5 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX pdf2html-1.4-gentoo.patch 2277 RMD160 1e5905b1821ce6a71dc5200760155eafc587d505 SHA1 69baa4e9d1158e256f94def9f4c3e2646a544042 SHA256 c4fb059289ccb1e20a85cf79d91dbe7aaa3feb83fa37bdd70f694191f5aaab26 +AUX pdf2html-1.4-libpng15.patch 218 RMD160 3aeff4a74efb2d35a852292214c55831c13eb1eb SHA1 e9369c0981e9a91aa5448819fc9697f769905e08 SHA256 f5e6a9c3682e0d2dbbe39192e1801001fc7b20d1bf54b87d6428c0f2745e9021 DIST pdf2html-1.4.tgz 22976 RMD160 1a8029045bd35834925579b0102114f77541918e SHA1 efa832bf43549bfc3d3a39f390cee081c183c751 SHA256 71ee70c56ec1629442518992e1de743287d7b8799d0aae75e3be8095f7245b61 -EBUILD pdf2html-1.4.ebuild 1229 RMD160 0d3ef02332b2537ff537661dfb136fd8183c09b0 SHA1 6a145798bb29fe6cc3a1f5c7e2341c3c648d77d0 SHA256 b5f890bc34e85d2a31c290b416cb0f37c1294ec16149586851d05a368a5183cb -MISC ChangeLog 2144 RMD160 83f549e7e1f3386993c3d4a89a26622f29d8b565 SHA1 a0cc5843d80ae42f1854af944424af561f55effa SHA256 96630444e134db2ba4e156183493b4e2da43fe91158729d42a67ff9ac42e9b10 +EBUILD pdf2html-1.4.ebuild 1150 RMD160 9df6de2014d7c4f633d6e5ebe90bb6403a51f228 SHA1 fd6c230afef0678abffdedd3d0bc45e3d555747a SHA256 5f9dc3340e4f025fe9e353631e2bf2c2848e298d373607900d3419838e8d24d1 +MISC ChangeLog 2356 RMD160 813879e51186fe6e7779be633104640ba4e3fe70 SHA1 197e679b9efbc24d67f0757e51a922a48dab7ef7 SHA256 9e5bd7af4110e2f9b6fbd0a5fc87c18b51c23cf69b4ecb3d1c8a6b602e414f04 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk5wwi8ACgkQXkR9YqOcLPE05gEAimVA5uZa2iZb+s3dCw2WqIaS +f65qgTUspAivT2pg7HkA/iaIlbrtIh8PhDXAlcoEPvcJCPahBZKA3HLWwELpi/cp +=xmMH +-----END PGP SIGNATURE----- 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