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
commitb409b396e2fee2a44c6af15bffa6f25d12daf315 (patch)
treedb93ce6339ce193c7e6546b77aeefd0f18107639 /media-gfx
parentSparc stable, Bug #250349. (diff)
downloadhistorical-b409b396e2fee2a44c6af15bffa6f25d12daf315.tar.gz
historical-b409b396e2fee2a44c6af15bffa6f25d12daf315.tar.bz2
historical-b409b396e2fee2a44c6af15bffa6f25d12daf315.zip
fix building with gcc-4.4, bug #272120
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/pngrewrite/ChangeLog8
-rw-r--r--media-gfx/pngrewrite/Manifest11
-rw-r--r--media-gfx/pngrewrite/files/pngrewrite-1.3.0-gcc44.patch19
-rw-r--r--media-gfx/pngrewrite/pngrewrite-1.3.0.ebuild5
4 files changed, 34 insertions, 9 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/Manifest b/media-gfx/pngrewrite/Manifest
index 880642dd7cf2..b89da826e279 100644
--- a/media-gfx/pngrewrite/Manifest
+++ b/media-gfx/pngrewrite/Manifest
@@ -1,16 +1,17 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX pngrewrite-1.3.0-gcc44.patch 411 RMD160 7e4f436b75e7deb5a667a6294c59c1089e6559b7 SHA1 1d330a315bd2bc4deba05fff46d136f5fe6f07b1 SHA256 fd41e366941673e4b4914311753f501149e7be28bb2bfdbf5a7c94d560a3aa40
DIST pngrewrite-1.2.1.zip 95519 RMD160 5885aff9386483f36cb68c8a68f13614234d47ba SHA1 29276b2646485fb41bc38e78d51f765772c2d014 SHA256 bff0ba86ef046d89666c8294f2ff9b2f17e06263034db90444525252038471e9
DIST pngrewrite-1.3.0.zip 105995 RMD160 5909e88b14d2c56e0d5bcfc02f70bcbe959207d7 SHA1 0a2a56c53e7b4cd0502c897092e859e92128d1bd SHA256 497d5b8f9fb096a2f5510711a2c76688998706a32cc93ca1709d238969d7ebc6
EBUILD pngrewrite-1.2.1.ebuild 746 RMD160 ed98ced23f594a5c2dbf9eb2f5b984b3b879ae8a SHA1 126c57f8cbe3daedb1741d8f3d3ba93c4f7140eb SHA256 49820823c855bd1a6b319847baa0195ab7e744cc845c09e53992d9a89084ba44
-EBUILD pngrewrite-1.3.0.ebuild 748 RMD160 fb461c3ee9f9b0c0b498396b5c8341d6cd80cfca SHA1 3473bf027cbe5324e30b0ad0a441faea1e404042 SHA256 266c505c55b51fe5fdc4a62acce79f3807bdad01092def36a59cc7d24bf35ac9
-MISC ChangeLog 1988 RMD160 720d4626e1babff8d44ee1e3b2a13478c1171d4a SHA1 d82f20b4dba8e98f24f530bb7d29d3198400d36b SHA256 0d9221c9091cc61ac4db63451f845df9a0b0da2607b71e6ef106f3c47693bcf7
+EBUILD pngrewrite-1.3.0.ebuild 796 RMD160 5e6a622a2839e36d373d7a72e77a3413997dbad2 SHA1 a1151bc3410d0cc0e7aa4e696f92313899665a57 SHA256 697bfde0f174bb116861a5a4efc61b3c61e7550dbbb3880becd8334538a8528c
+MISC ChangeLog 2142 RMD160 b2c2ed0aa887dfc30d3078a96a3c694fd3436c2c SHA1 19935067ce4532dfd239a401f8a520042d7966a4 SHA256 adfcb6d40083e1af5d027fedbdcc6739354009bc32f27812d9fd4e133011e6e4
MISC metadata.xml 161 RMD160 60f70b15d67f0e6aafc59833b2f0a30e30b51765 SHA1 1c35398222ef7ed670c31965e42cca77fe4b1da6 SHA256 e8daadc5e27e3ef1148993b5b48d96e93bc36d798a1f416693f7f8c84be427e1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkns3sEACgkQkKaRLQcq0GKBwACfU2Gq2DWeykImXL95VEvNsNvx
-n98AoJlnG1hmUx0/4sfHhsqk0HZD6Fpb
-=jN3y
+iEYEARECAAYFAkokKbQACgkQkKaRLQcq0GKgCwCdH8Wd7xEm5HL7T66XzCxtVCTL
+/tgAn2074tBninzgnAm/5SGi+QFtkkQi
+=1bkE
-----END PGP SIGNATURE-----
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} \