diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 02:24:21 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-09-15 02:24:21 +0000 |
| commit | 584485847c7be7a2b1ab6d872ef03b4c33afb10e (patch) | |
| tree | 5bebc6bc9329a4d3a0bce889d96ce010f720cdfc /app-cdr | |
| parent | Fix building with libpng15 wrt #378391 by Diego Elio Pettenò (diff) | |
| download | gentoo-2-584485847c7be7a2b1ab6d872ef03b4c33afb10e.tar.gz gentoo-2-584485847c7be7a2b1ab6d872ef03b4c33afb10e.tar.bz2 gentoo-2-584485847c7be7a2b1ab6d872ef03b4c33afb10e.zip | |
Fix building with libpng15 (missing zlib.h include) wrt #380139 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/dvdisaster/ChangeLog | 7 | ||||
| -rw-r--r-- | app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild | 13 | ||||
| -rw-r--r-- | app-cdr/dvdisaster/files/dvdisaster-0.72.1-libpng15.patch | 11 |
3 files changed, 25 insertions, 6 deletions
diff --git a/app-cdr/dvdisaster/ChangeLog b/app-cdr/dvdisaster/ChangeLog index 0d3adae20207..d12b9d4565f5 100644 --- a/app-cdr/dvdisaster/ChangeLog +++ b/app-cdr/dvdisaster/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-cdr/dvdisaster # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/ChangeLog,v 1.15 2011/08/21 19:03:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/ChangeLog,v 1.16 2011/09/15 02:24:21 ssuominen Exp $ + + 15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> dvdisaster-0.72.1.ebuild, + +files/dvdisaster-0.72.1-libpng15.patch: + Fix building with libpng15 (missing zlib.h include) wrt #380139 by Diego Elio + Pettenò 21 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> dvdisaster-0.72.1.ebuild: diff --git a/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild b/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild index afabbcd0f327..5ab9daabbc61 100644 --- a/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild +++ b/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild,v 1.2 2011/08/21 19:03:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvdisaster/dvdisaster-0.72.1.ebuild,v 1.3 2011/09/15 02:24:21 ssuominen Exp $ -EAPI=2 +EAPI=4 inherit eutils gnome2-utils versionator MY_P=${PN}-$(replace_version_separator 2 '.') @@ -24,6 +24,10 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} +src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch +} + # - There is no autotools, use_ functions won't work # - NLS disabled because sys-devel/gettext fails, if you enable it # you need also virtual/libintl because it links to it for FreeBSD @@ -47,12 +51,11 @@ src_configure() { --localedir=/usr/share/locale \ --buildroot="${D}" \ --with-nls=no \ - ${myconf} \ - || die "./configure failed" + ${myconf} || die } src_install() { - emake install || die "emake install failed" + emake install newicon contrib/${PN}48.png ${PN}.png make_desktop_entry ${PN} ${PN} ${PN} "System;Utility" diff --git a/app-cdr/dvdisaster/files/dvdisaster-0.72.1-libpng15.patch b/app-cdr/dvdisaster/files/dvdisaster-0.72.1-libpng15.patch new file mode 100644 index 000000000000..3dc25f9b22ac --- /dev/null +++ b/app-cdr/dvdisaster/files/dvdisaster-0.72.1-libpng15.patch @@ -0,0 +1,11 @@ +--- tools/pngio.c ++++ tools/pngio.c +@@ -17,6 +17,8 @@ + * or direct your browser at http://www.gnu.org. + */ + ++#include <zlib.h> ++ + #include <errno.h> + #include <stdio.h> + #include <stdlib.h> |