Fix compiling with -O0 thanks to Lee Leahu (bug #319559).

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 89 insertions, 2 deletions

diff --git a/media-gfx/icoutils/ChangeLog b/media-gfx/icoutils/ChangeLog
index 471b4b091400..cfd33e1e2cf8 100644
--- a/media-gfx/icoutils/ChangeLog
+++ b/media-gfx/icoutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/icoutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/ChangeLog,v 1.21 2010/03/06 09:33:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/ChangeLog,v 1.22 2010/05/13 16:44:52 jer Exp $
+
+*icoutils-0.29.1-r1 (13 May 2010)
+
+  13 May 2010; Jeroen Roovers <jer@gentoo.org> +icoutils-0.29.1-r1.ebuild,
+  +files/icoutils-0.29.1-locale.patch:
+  Fix compiling with -O0 thanks to Lee Leahu (bug #319559).
 
 *icoutils-0.29.1 (06 Mar 2010)
 
diff --git a/media-gfx/icoutils/Manifest b/media-gfx/icoutils/Manifest
index b478e700ca0d..18cfb4719fc2 100644
--- a/media-gfx/icoutils/Manifest
+++ b/media-gfx/icoutils/Manifest
@@ -1,3 +1,4 @@
+AUX icoutils-0.29.1-locale.patch 831 RMD160 49c2b2e1b3d5dad5ee7772e65e8dabf4ad979a74 SHA1 b8cdf893f93ea548535735278eeedd8363259266 SHA256 dcbe19a6826c339bcde7773b18947ec479312effe748c5b78b0500862ed2287a
 DIST icoutils-0.22.0.tar.gz 392554 RMD160 24daec3a0b90d9e2583614a2d5ea4a953b083a9e SHA1 e44a944694bf35f5d5a8cd0055f4d0eaf7eae103 SHA256 e9f414654ec8cdb1c2e3e0cd1592e90f473619b37e1efb9c604c545dd470491b
 DIST icoutils-0.26.0.tar.gz 603257 RMD160 b7b75c0a8b7734fd50e9e72c085270df2b115b44 SHA1 fe31911d6bbfa6d4066bae7d3b4f70908d14e097 SHA256 ffb6fdd3eaf0f24c53759a4eda6090dde60a4efd3342ee6c3a2a0305507b5871
 DIST icoutils-0.29.0.tar.bz2 456842 RMD160 8f4a451fb67e55d928d69f3dee0fff27267f20b6 SHA1 7ff2480b99f9d497b444e843efa12833b53bc3cd SHA256 5d906951479d6efa453fc933b3b705d699a8c02fd005343e58a0f296cf816d7c
@@ -5,6 +6,7 @@ DIST icoutils-0.29.1.tar.bz2 456955 RMD160 99d145eb2f8f552c42749b379fd71e20f9b86
 EBUILD icoutils-0.22.0.ebuild 833 RMD160 60bc3c204e1c7ef41e6684e5b135d070392df809 SHA1 39f98b065e690745d493151931b93f28ed3fb292 SHA256 670245a78187af80c7c477bb374642df6885805bee30f97bc0dea001d015e34f
 EBUILD icoutils-0.26.0.ebuild 915 RMD160 d99e31f451b42a05b46263a7f0bbf3d96805dc6e SHA1 a57ba5f562ff41b0f8efc2bed7d81cb6d2aeb2e4 SHA256 c1014edafa53f21aa7b86abd5dd2c4adb3edfc1e64c3e2d75b86befb97f86d9b
 EBUILD icoutils-0.29.0.ebuild 922 RMD160 1875b64c57f5ba2080656505733e2f8aa919cd4c SHA1 4653c654ee9bf0bcb069666174585f3be542cda6 SHA256 377fa88c6f3870a5655daa95af985345d0b220c9d03a24a2e5c241ced2b67193
+EBUILD icoutils-0.29.1-r1.ebuild 1002 RMD160 6f2aff14ae48efd39374a2ebfaec9580e597c318 SHA1 f1ea2e0d39e06b4caaa04a62d9f8c7ca56630e40 SHA256 c4bff65443dcabdbd5f0950127f0ef3d112a0a8cb14223fe43dda33e523b6765
 EBUILD icoutils-0.29.1.ebuild 922 RMD160 cf65bef16b1f3014bc550cef5d1e6993a60a5fff SHA1 f5a075c36c9601fcdfd55d2b6095718fdcaec6ed SHA256 9116370117caa0775310a0594b1e56bad52da9526fafaa902aa47f95865ea443
-MISC ChangeLog 2526 RMD160 227b1e18b0ae82ad60de2249acef077576e3b3c4 SHA1 1baf18381169631041bd95f9c5fe0ec96633c52b SHA256 519cb1f1f2fbca5813297c9f55c802b8c1860bf0b2b40dd21a53ee4a45a813d0
+MISC ChangeLog 2732 RMD160 8c630d227b6cb335b9336dd44530e479804b915d SHA1 49486dd2a51a643a6225709e221148b3164c5ff3 SHA256 ec447d4207ec501ac465b2a4d5559ff2f6254fc9e5a2d28a3d3c2ed67c7ac528
 MISC metadata.xml 455 RMD160 6afcd820ab89ee054838952bfb550f905e5ca4bc SHA1 4a2b42b8c1f9a58812eb08be9646a6acc79e78fd SHA256 f4a92d24e28471645cd21e2b18b02581067428d50f225949654fc8a0b0510f7b
diff --git a/media-gfx/icoutils/files/icoutils-0.29.1-locale.patch b/media-gfx/icoutils/files/icoutils-0.29.1-locale.patch
new file mode 100644
index 000000000000..d73ae119ea5e
--- /dev/null
+++ b/media-gfx/icoutils/files/icoutils-0.29.1-locale.patch
@@ -0,0 +1,39 @@
+Fix compiling with -O0 (see <https://bugs.gentoo.org/show_bug.cgi?id=319559>)
+
+
+--- a/wrestool/main.c
++++ b/wrestool/main.c
+@@ -32,6 +32,10 @@
+ #include "common/string-utils.h"
+ #include "wrestool.h"
+ 
++#ifdef HAVE_LOCALE_H
++#include <locale.h>
++#endif
++
+ #define PROGRAM "wrestool"
+ 
+ 
+--- a/icotool/main.c
++++ b/icotool/main.c
+@@ -37,6 +37,10 @@
+ #include "common/io-utils.h"
+ #include "icotool.h"
+ 
++#ifdef HAVE_LOCALE_H
++#include <locale.h>
++#endif
++
+ #define PROGRAM "icotool"
+ 
+ static int32_t image_index = -1;
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,6 +34,7 @@
+ AC_HEADER_SYS_WAIT
+ AC_HEADER_TIME
+ #AC_CHECK_HEADERS([byteswap.h errno.h fcntl.h getopt.h limits.h sys/stat.h sys/time.h sys/types.h unistd.h])
++AC_CHECK_HEADERS([locale.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_INLINE
diff --git a/media-gfx/icoutils/icoutils-0.29.1-r1.ebuild b/media-gfx/icoutils/icoutils-0.29.1-r1.ebuild
new file mode 100644
index 000000000000..8caccbcd22a5
--- /dev/null
+++ b/media-gfx/icoutils/icoutils-0.29.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/icoutils/icoutils-0.29.1-r1.ebuild,v 1.1 2010/05/13 16:44:52 jer Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="A set of programs for extracting and converting images in Microsoft Windows icon and cursor files (.ico, .cur)."
+HOMEPAGE="http://www.nongnu.org/icoutils/"
+SRC_URI="http://savannah.nongnu.org/download/icoutils/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="media-libs/libpng
+		nls? ( virtual/libintl )
+		>=dev-lang/perl-5.6
+		>=dev-perl/libwww-perl-5.64"
+
+DEPEND="${RDEPEND}
+		nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-locale.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		`use_enable nls` \
+		--disable-dependency-tracking || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+}