summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2009-06-01 19:17:46 +0000
committerMarkus Meier <maekke@gentoo.org>2009-06-01 19:17:46 +0000
commitbc61593e8020c3b362f50c0ec879246d14b7b581 (patch)
tree659fb0862cb1fff463a86fc57926e55e4ef2dba9 /media-gfx
parentSparc stable, Bug #250349. (diff)
downloadgentoo-2-bc61593e8020c3b362f50c0ec879246d14b7b581.tar.gz
gentoo-2-bc61593e8020c3b362f50c0ec879246d14b7b581.tar.bz2
gentoo-2-bc61593e8020c3b362f50c0ec879246d14b7b581.zip
fix building with gcc-4.4, bug #272120
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/pngrewrite/ChangeLog8
-rw-r--r--media-gfx/pngrewrite/files/pngrewrite-1.3.0-gcc44.patch19
-rw-r--r--media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild5
3 files changed, 28 insertions, 4 deletions
diff --git a/media-gfx/pngrewrite/ChangeLog b/media-gfx/pngrewrite/ChangeLog
index 8e9935f6b2e5..72b878108ac9 100644
--- a/media-gfx/pngrewrite/ChangeLog
+++ b/media-gfx/pngrewrite/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/pngrewrite
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngrewrite/ChangeLog,v 1.17 2009/04/20 20:43:24 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngrewrite/ChangeLog,v 1.18 2009/06/01 19:17:46 maekke Exp $
+
+ 01 Jun 2009; Markus Meier <maekke@gentoo.org> pngrewrite-1.3.0.ebuild,
+ +files/pngrewrite-1.3.0-gcc44.patch:
+ fix building with gcc-4.4, bug #272120
*pngrewrite-1.3.0 (20 Apr 2009)
diff --git a/media-gfx/pngrewrite/files/pngrewrite-1.3.0-gcc44.patch b/media-gfx/pngrewrite/files/pngrewrite-1.3.0-gcc44.patch
new file mode 100644
index 000000000000..e514c5d3fa7c
--- /dev/null
+++ b/media-gfx/pngrewrite/files/pngrewrite-1.3.0-gcc44.patch
@@ -0,0 +1,19 @@
+--- pngrewrite.c.orig 2009-06-01 21:12:19.000000000 +0200
++++ pngrewrite.c 2009-06-01 21:12:29.000000000 +0200
+@@ -89,6 +89,7 @@
+ //#define PNGRW_SUPPORT_1_ARG_MODE
+ #define PNGRW_PALSORT_BY_FREQUENCY
+
++#include <png.h>
+
+ #include <stdio.h>
+ #include <string.h>
+@@ -109,8 +110,6 @@
+ #include <unistd.h> /* for isatty() */
+ #endif
+
+-#include <png.h>
+-
+ struct errstruct {
+ jmp_buf jbuf;
+ char errmsg[200];
diff --git a/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild b/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild
index 38e5f864295c..dcb99bb3b0bf 100644
--- a/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild
+++ b/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild,v 1.1 2009/04/20 20:43:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild,v 1.2 2009/06/01 19:17:46 maekke Exp $
-inherit toolchain-funcs
+inherit toolchain-funcs base
DESCRIPTION="A utility which reduces large palettes in PNG images"
HOMEPAGE="http://entropymine.com/jason/pngrewrite/"
@@ -18,6 +18,7 @@ DEPEND="${RDEPEND}
app-arch/unzip"
S=${WORKDIR}
+PATCHES=( "${FILESDIR}"/${P}-gcc44.patch )
src_compile() {
$(tc-getCC) ${LDFLAGS} ${CFLAGS} ${PN}.c -lpng -o ${PN} \