Fix build with GCC 4.7 (bug #422453).

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

4 files changed, 51 insertions, 12 deletions

diff --git a/media-gfx/gimmage/ChangeLog b/media-gfx/gimmage/ChangeLog
index 487f71c72453..f5ae45a07d54 100644
--- a/media-gfx/gimmage/ChangeLog
+++ b/media-gfx/gimmage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimmage
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/ChangeLog,v 1.17 2012/05/05 07:00:25 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/ChangeLog,v 1.18 2013/02/19 18:45:27 dirtyepic Exp $
+
+  19 Feb 2013; Ryan Hill <dirtyepic@gentoo.org> gimmage-0.2.3.ebuild,
+  +files/gimmage-0.2.3-gcc47.patch:
+  Fix build with GCC 4.7 (bug #422453).
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> gimmage-0.2.3.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/media-gfx/gimmage/Manifest b/media-gfx/gimmage/Manifest
index de89bf88d10b..02904e445698 100644
--- a/media-gfx/gimmage/Manifest
+++ b/media-gfx/gimmage/Manifest
@@ -1,7 +1,22 @@
-AUX gimmage-0.2.3-as-needed.patch 454 RMD160 f1c63300f82c854dae63d3e3f598861157816974 SHA1 289a418dfc823fa839ec8be8e4374389e7d618b1 SHA256 fe3cfc536cdf8feacad22642f2a12f8389123f50a110a4c5ea06a1da57bdc681
-AUX gimmage-0.2.3-desktop-entry.patch 950 RMD160 c152c18403c1eecc8a43f47f3afb3010600574a4 SHA1 ddcb51f24316cc863cd1a1f16317c8e5b608fa40 SHA256 05df00da5d4e17fbced4b100493047a502ba088b1370a5c3fa5232ddd7e226ad
-AUX gimmage-0.2.3-gcc43.patch 304 RMD160 bacef4e79fd289200b8c4f0714dc5326365cfd3b SHA1 f1751dc5ae54f7abfd86e3353d3459a549a99f1c SHA256 65f9f65c8cdf8d25ac397e752722e2c537c95c025f742c8f9810d867cb7a3e3c
-DIST gimmage-0.2.3.tar.gz 193777 RMD160 d3fd105390e21548cf9c83b199681b53616f3640 SHA1 732dee063553b787b65a0a5bd3d207bdb5d01df1 SHA256 3d5ce3c3fd22efc9fd930e97e33e2c13a755e0a9cf099d12d5f7ecf92cab907b
-EBUILD gimmage-0.2.3.ebuild 939 RMD160 42ef9f9dd001a8fd877191685802b6347c52c667 SHA1 d15a86655a70774871a64fcf2fcf0517573189f7 SHA256 779a24a4a410fc7a639a9c8bb4cfeee9d771acd1fa570f19c989609a58a54fcd
-MISC ChangeLog 2335 RMD160 fc4626a5e1b4f3c4737c8f1115b32207f13e2b57 SHA1 da22790b3af202c82970de98d421409390714ee5 SHA256 5007e28d25151ae45f08fb5696a67cd66d863422054f292479a509e70efcac2b
-MISC metadata.xml 245 RMD160 c9fe33a9ae20f7617aa8a487483da2658de85bb7 SHA1 1c9c5c6d13fed7e85498b05512ab4f5b156b17dd SHA256 5a9749807b4d8cc7acd94cfd2edec77b1f69b83d18a9ea3be922977fc85d525e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gimmage-0.2.3-as-needed.patch 454 SHA256 fe3cfc536cdf8feacad22642f2a12f8389123f50a110a4c5ea06a1da57bdc681 SHA512 5f1a6b464ce58d98e500dad063b7fc88e12ae522b4ece3239ebfcc5205fd415422f3a9e4ca422a417aa67afb629d2eb303e069e7ea3f2206cb091219a3c75896 WHIRLPOOL d1d0ec0e2c6d392029674dd9cc851568e88513d0a1d7f4520e5603bddd747f19a255e8462a15408caa272ac17019ce23dae16a8c74b70c476e7a611face6c9db
+AUX gimmage-0.2.3-desktop-entry.patch 950 SHA256 05df00da5d4e17fbced4b100493047a502ba088b1370a5c3fa5232ddd7e226ad SHA512 3ae966b8008992fe0d3ec4daf46a5760e785d20dce4c382a3368c96079a4bd929773996c6f4056ec3834e5dbc7a6c83fccdaee8e1b04e003b0cae38d8c05a19e WHIRLPOOL e9de5e17aeaf7af2418b71a0810366054b64dfe6f8a4acbc29eba949d90ad64b22d632d4f2bdd49bf0940c3750639a122393a87916e2a3d80cdad8a8a242c7bc
+AUX gimmage-0.2.3-gcc43.patch 304 SHA256 65f9f65c8cdf8d25ac397e752722e2c537c95c025f742c8f9810d867cb7a3e3c SHA512 bd8b62588904ea4000b5b2fc846a29eae3fe48dbf22e91564e2015f263f5b47df580785fdc64d1632a6281a798c6a4d11468a3fd30eab3a6d7a7b30bdd31c3f0 WHIRLPOOL d16a184c1b426110009121cdef2b61e5c6a71475abe9c0dd58f952663531f0d3d4cf623a79579df6c53cff6c58ab57c79cb3761cc9e13f122f48c67ddf182b1e
+AUX gimmage-0.2.3-gcc47.patch 384 SHA256 fa7b885535f8ac994705a71289f096162461fc8d520dedb4d6661939c483aaed SHA512 b7fae449c2d5ebdfae415df0ad9615fa4832998170dfcfd87110e45a6041b91216d8b3e91ab056929183fd0ff6cf9e9ab154c387299b3fe1d41f6e7952062459 WHIRLPOOL 57bd3cd3afccf40c9a3957b01ced04359674124a15bada5b120ccbd4a5a9714af2c0ba6de1738603f506387fe12e66775e2dcdef841ae2f07704da129da61fd8
+DIST gimmage-0.2.3.tar.gz 193777 SHA256 3d5ce3c3fd22efc9fd930e97e33e2c13a755e0a9cf099d12d5f7ecf92cab907b SHA512 ff8fdf860d4712502e6e8656a14e5327a5b89af49f312e54de5f0e80cd6e406214a61228c79ad643c2640268d5eacfd760c83acbebdc7fa9b6e7c094728be167 WHIRLPOOL 7d1a9485da568baec8c430dc5a9fc12eb7dd8943fa17e5fbdc00ea4334548f1f42cad1690c6f171ecb682853a86d79e0e8324e49472c5ccbd8831a800d863792
+EBUILD gimmage-0.2.3.ebuild 977 SHA256 5e730e78b3dd99f9d48cb64d56fda64a4fb14878a4614e893bce339bf4737d45 SHA512 de2caa328a39e476446d8309936cd440973ebc0c75643a94d807abc9689fc8173d10ca5fa5bde86d3f136df8c37cd545975c766c8cb8e1128f5b665412ac661c WHIRLPOOL b1ad9832f7f8bd46a6d5099248a46cd62419807d70315e64bb66c19dbbd70d99fe0ca36c4254a5cc1b7d40fff4518e15118751a9cd2c5573ccf33ca1a44ddaba
+MISC ChangeLog 2485 SHA256 eebed760566fe7d497656cd5b296b8670cfc6c827de674ec559e42d096cade07 SHA512 1628b4a8f33d38332af9b8bbb757912ecc8e4cb2ddfe6e946a77e6d413ab2d87b0904714214a39aec12c2cbb2905a58ace7337f41d65de25f073fae4430684ac WHIRLPOOL 1f7a57c0178d7f7c08d6dae6fcb7eb23c3ccf866f27710a170e4b492400b5afc7601175b8a6674f0ef5331a1c37e9f70ae93de9f8537e67f876ee513d9000349
+MISC metadata.xml 245 SHA256 5a9749807b4d8cc7acd94cfd2edec77b1f69b83d18a9ea3be922977fc85d525e SHA512 11dedac1ef8a23afbc1bb600a61d4b347fd56ab815669e8bc670b93843eb657fcff912a252c90bd92801eab0c0a83df22bd1c5d631d2d0e58eeee20d2fda54dd WHIRLPOOL 2c0d392fcd754e771c7533b87241ad94bcc56169f28647753c7f9ed9ca0721b09497944a066fd2b1abeb9a196ddef812ceb3df7c3f70a25a9a2913ed34e1c18a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRI8rPAAoJEO04vUmVeoRjW2MH/j3YhuknJgm3hl4aMqQMC5k4
+YHIdxPMfn//BjLkHuWsWzvrosJTic6QdOTQe/Zf5FR7aLCwI+y1Q/lnmf3SIDeYd
+LtgmL5WVwEEn+Iy1Puv3pXZDbiqGLkRCg6uXiqfC2UpPSneHDYRG5x95REmRuH96
+ioiBGfIlYaz9HFwEyBGzk1qxt7iwlnOAAy63GberWB4eL50iYzRbJpg93kE0Pcyb
+EU/8YFnSGoa3PfZzDSxxgeekBQLX3aFqZD6iFxsro60NVS8KXa5hlwt73tsPD3xv
+C9T5SyLkIuQBpqruB0rqbsr52QSRPkKJEjRr0Iabs3EaEmAQyTxpTKanttNKcWQ=
+=yhpl
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/gimmage/files/gimmage-0.2.3-gcc47.patch b/media-gfx/gimmage/files/gimmage-0.2.3-gcc47.patch
new file mode 100644
index 000000000000..bc39028cf161
--- /dev/null
+++ b/media-gfx/gimmage/files/gimmage-0.2.3-gcc47.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/422453
+
+error: 'get_current_dir_name' was not declared in this scope
+
+
+ src/FileManager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/FileManager.cpp
++++ b/src/FileManager.cpp
+@@ -30,7 +30,7 @@ Copyright 2006 Bartek Kostrzewa
+ 
+ extern "C" {
+ #include <libintl.h>
+-// #include <unistd.h>
++#include <unistd.h>
+ #include <sys/stat.h>
+ }
+ 
diff --git a/media-gfx/gimmage/gimmage-0.2.3.ebuild b/media-gfx/gimmage/gimmage-0.2.3.ebuild
index de34cd9b9a53..980cc139770c 100644
--- a/media-gfx/gimmage/gimmage-0.2.3.ebuild
+++ b/media-gfx/gimmage/gimmage-0.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/gimmage-0.2.3.ebuild,v 1.11 2012/05/05 07:00:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimmage/gimmage-0.2.3.ebuild,v 1.12 2013/02/19 18:45:27 dirtyepic Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc43.patch \
 		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-desktop-entry.patch
+		"${FILESDIR}"/${P}-desktop-entry.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 	eautoreconf
 }