| 1 |
ssuominen 13/04/30 06:47:27 |
| 2 |
|
| 3 |
Modified: ChangeLog png2ico-2002.12.08.ebuild |
| 4 |
Log: |
| 5 |
Fix building with libpng16 from which we don't get <cstring> within <png.h> anymore wrt #467918 by Antoine Lemoine |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 media-gfx/png2ico/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/png2ico/ChangeLog?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/png2ico/ChangeLog?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/png2ico/ChangeLog?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/png2ico/ChangeLog,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- ChangeLog 9 Oct 2011 09:04:00 -0000 1.1 |
| 23 |
+++ ChangeLog 30 Apr 2013 06:47:27 -0000 1.2 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
# ChangeLog for media-gfx/png2ico |
| 26 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/png2ico/ChangeLog,v 1.1 2011/10/09 09:04:00 ssuominen Exp $ |
| 28 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/png2ico/ChangeLog,v 1.2 2013/04/30 06:47:27 ssuominen Exp $ |
| 30 |
+ |
| 31 |
+ 30 Apr 2013; Samuli Suominen <ssuominen@g.o> |
| 32 |
+ png2ico-2002.12.08.ebuild, +files/png2ico-2002.12.08-memset_and_strcmp.patch: |
| 33 |
+ Fix building with libpng16 from which we don't get <cstring> within <png.h> |
| 34 |
+ anymore wrt #467918 by Antoine Lemoine |
| 35 |
|
| 36 |
*png2ico-2002.12.08 (09 Oct 2011) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.2 media-gfx/png2ico/png2ico-2002.12.08.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/png2ico/png2ico-2002.12.08.ebuild?rev=1.2&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/png2ico/png2ico-2002.12.08.ebuild?rev=1.2&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/png2ico/png2ico-2002.12.08.ebuild?r1=1.1&r2=1.2 |
| 46 |
|
| 47 |
Index: png2ico-2002.12.08.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/png2ico/png2ico-2002.12.08.ebuild,v |
| 50 |
retrieving revision 1.1 |
| 51 |
retrieving revision 1.2 |
| 52 |
diff -u -r1.1 -r1.2 |
| 53 |
--- png2ico-2002.12.08.ebuild 9 Oct 2011 09:04:00 -0000 1.1 |
| 54 |
+++ png2ico-2002.12.08.ebuild 30 Apr 2013 06:47:27 -0000 1.2 |
| 55 |
@@ -1,9 +1,9 @@ |
| 56 |
-# Copyright 1999-2011 Gentoo Foundation |
| 57 |
+# Copyright 1999-2013 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/png2ico/png2ico-2002.12.08.ebuild,v 1.1 2011/10/09 09:04:00 ssuominen Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/png2ico/png2ico-2002.12.08.ebuild,v 1.2 2013/04/30 06:47:27 ssuominen Exp $ |
| 61 |
|
| 62 |
-EAPI=4 |
| 63 |
-inherit toolchain-funcs |
| 64 |
+EAPI=5 |
| 65 |
+inherit eutils toolchain-funcs |
| 66 |
|
| 67 |
DESCRIPTION="PNG to icon converter" |
| 68 |
HOMEPAGE="http://winterdrache.de/freeware/png2ico/index.html" |
| 69 |
@@ -14,13 +14,15 @@ |
| 70 |
KEYWORDS="~amd64 ~x86" |
| 71 |
IUSE="" |
| 72 |
|
| 73 |
-RDEPEND="media-libs/libpng |
| 74 |
- sys-libs/zlib" |
| 75 |
+RDEPEND="media-libs/libpng:0= |
| 76 |
+ sys-libs/zlib:=" |
| 77 |
DEPEND="${RDEPEND}" |
| 78 |
|
| 79 |
S=${WORKDIR}/${PN} |
| 80 |
|
| 81 |
src_prepare() { |
| 82 |
+ epatch "${FILESDIR}"/${P}-memset_and_strcmp.patch |
| 83 |
+ |
| 84 |
sed -i \ |
| 85 |
-e 's:CPPFLAGS=-W -Wall -O2:CXXFLAGS+=-W -Wall:' \ |
| 86 |
-e 's:g++ $(CPPFLAGS):$(CXX) $(LDFLAGS) $(CXXFLAGS):' \ |
Archives