diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 15:13:19 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-14 15:13:19 +0000 |
| commit | 40dcf34567667fcf870278805686ff09e9a6a396 (patch) | |
| tree | 8a7b88769650ce4f7229708759713358916293b3 /x11-misc/xrmap | |
| parent | Remove old configure option --with-remote-pid-file (diff) | |
| download | gentoo-2-40dcf34567667fcf870278805686ff09e9a6a396.tar.gz gentoo-2-40dcf34567667fcf870278805686ff09e9a6a396.tar.bz2 gentoo-2-40dcf34567667fcf870278805686ff09e9a6a396.zip | |
Fix building with libpng15 (missing zlib.h include) wrt #378715 by Diego Elio Pettenò. Fix missing virtual/jpeg, media-libs/libpng and sys-libs/zlib dependencies (see image.c for reference).
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xrmap')
| -rw-r--r-- | x11-misc/xrmap/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/xrmap/files/xrmap-2.33-libpng15.patch | 10 | ||||
| -rw-r--r-- | x11-misc/xrmap/xrmap-2.33-r1.ebuild | 12 |
3 files changed, 24 insertions, 6 deletions
diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog index a0b2e1cc2e35..b2514872bf36 100644 --- a/x11-misc/xrmap/ChangeLog +++ b/x11-misc/xrmap/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xrmap # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.21 2011/03/25 17:10:45 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.22 2011/09/14 15:13:19 ssuominen Exp $ + + 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> xrmap-2.33-r1.ebuild, + +files/xrmap-2.33-libpng15.patch: + Fix building with libpng15 (missing zlib.h include) wrt #378715 by Diego Elio + Pettenò. Fix missing virtual/jpeg, media-libs/libpng and sys-libs/zlib + dependencies (see image.c for reference). *xrmap-2.33-r1 (25 Mar 2011) diff --git a/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch b/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch new file mode 100644 index 000000000000..48cd29a430f2 --- /dev/null +++ b/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch @@ -0,0 +1,10 @@ +--- image.c ++++ image.c +@@ -18,6 +18,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <zlib.h> /* gzFile */ + #include <png.h> + #include <jpeglib.h> + diff --git a/x11-misc/xrmap/xrmap-2.33-r1.ebuild b/x11-misc/xrmap/xrmap-2.33-r1.ebuild index d27a1c8969ef..436119c7acd6 100644 --- a/x11-misc/xrmap/xrmap-2.33-r1.ebuild +++ b/x11-misc/xrmap/xrmap-2.33-r1.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/x11-misc/xrmap/xrmap-2.33-r1.ebuild,v 1.1 2011/03/25 17:10:45 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33-r1.ebuild,v 1.2 2011/09/14 15:13:19 ssuominen Exp $ EAPI=2 inherit eutils toolchain-funcs @@ -22,11 +22,13 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="zlib" +IUSE="" CDEPEND="x11-libs/libX11 x11-libs/libXpm - zlib? ( sys-libs/zlib )" + virtual/jpeg + >=media-libs/libpng-1.4 + sys-libs/zlib" RDEPEND="${CDEPEND} x11-misc/xdg-utils app-text/gv @@ -44,8 +46,8 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${P}-Makefile.kit.patch \ "${FILESDIR}"/${P}-as-needed.patch \ - "${FILESDIR}"/${P}-parallel-make.patch - use zlib || sed -i 's/-DZLIB\|-lz//g' Makefile.noimake || die + "${FILESDIR}"/${P}-parallel-make.patch \ + "${FILESDIR}"/${P}-libpng15.patch sed -e 's,^\(X11DIR=\).*,\1/usr/,g' \ -e 's,^\(EDITOR=\).*,\1less,g' \ |