summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-09-21 18:39:29 +0000
committerTim Harder <radhermit@gentoo.org>2011-09-21 18:39:29 +0000
commita3f90283c8153999e218e73616e7aa42a38fa0aa (patch)
treefa23c8090910a6e8d6bee260ce9ed051f7aa105e /media-gfx/darktable
parentRemove old. (diff)
downloadgentoo-2-a3f90283c8153999e218e73616e7aa42a38fa0aa.tar.gz
gentoo-2-a3f90283c8153999e218e73616e7aa42a38fa0aa.tar.bz2
gentoo-2-a3f90283c8153999e218e73616e7aa42a38fa0aa.zip
Fix build with libpng-1.5 (bug #383879).
(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/darktable')
-rw-r--r--media-gfx/darktable/ChangeLog6
-rw-r--r--media-gfx/darktable/darktable-0.9.2-r2.ebuild3
-rw-r--r--media-gfx/darktable/files/darktable-0.9.2-zlib-header.patch10
3 files changed, 17 insertions, 2 deletions
diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index f35ef9252e42..da4359a8a2a7 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/darktable
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.9 2011/09/14 12:59:27 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.10 2011/09/21 18:39:29 radhermit Exp $
+
+ 21 Sep 2011; Tim Harder <radhermit@gentoo.org> darktable-0.9.2-r2.ebuild,
+ +files/darktable-0.9.2-zlib-header.patch:
+ Fix build with libpng-1.5 (bug #383879).
*darktable-0.9.2-r2 (14 Sep 2011)
diff --git a/media-gfx/darktable/darktable-0.9.2-r2.ebuild b/media-gfx/darktable/darktable-0.9.2-r2.ebuild
index b1020436e987..cbf7b02a7a36 100644
--- a/media-gfx/darktable/darktable-0.9.2-r2.ebuild
+++ b/media-gfx/darktable/darktable-0.9.2-r2.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/darktable/darktable-0.9.2-r2.ebuild,v 1.1 2011/09/14 12:59:27 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-0.9.2-r2.ebuild,v 1.2 2011/09/21 18:39:29 radhermit Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -52,6 +52,7 @@ PATCHES=(
"${FILESDIR}"/${P}-system-libraw.patch
"${FILESDIR}"/${PN}-0.9.1-no-rawspeed.patch
"${FILESDIR}"/${PN}-0.9-cflags.patch
+ "${FILESDIR}"/${P}-zlib-header.patch
)
src_prepare() {
diff --git a/media-gfx/darktable/files/darktable-0.9.2-zlib-header.patch b/media-gfx/darktable/files/darktable-0.9.2-zlib-header.patch
new file mode 100644
index 000000000000..3f73e7989a99
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-0.9.2-zlib-header.patch
@@ -0,0 +1,10 @@
+--- darktable-0.9.2/src/imageio/format/png.c.orig
++++ darktable-0.9.2/src/imageio/format/png.c
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <png.h>
+ #include <inttypes.h>
++#include <zlib.h>
+
+ DT_MODULE(1)
+