Fix compilation problems due missing header, bug #356563 by pp--, Bradley Broom and Balint SZNTE.

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64

4 files changed, 33 insertions, 19 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 79b5bca1153f..f4c6464488cd 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.217 2011/08/19 11:20:17 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.218 2011/09/11 09:12:14 pacho Exp $
+
+  11 Sep 2011; Pacho Ramos <pacho@gentoo.org> gcalctool-5.32.2.ebuild,
+  +files/gcalctool-5.32.2-missing-header.patch:
+  Fix compilation problems due missing header, bug #356563 by pp--, Bradley
+  Broom and Balint SZENTE.
 
 *gcalctool-6.0.2 (19 Aug 2011)
 
diff --git a/gnome-extra/gcalctool/Manifest b/gnome-extra/gcalctool/Manifest
index 6e7d42446beb..f52bcd3eac0a 100644
--- a/gnome-extra/gcalctool/Manifest
+++ b/gnome-extra/gcalctool/Manifest
@@ -1,26 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gcalctool-5.32.2-missing-header.patch 262 RMD160 5bae9a4cae9788676ce8bad0d62531cbb2864a77 SHA1 b31d228be15e8ee18dc79075e4133298f8ef0cf8 SHA256 ff47c2953d8dfc4dfe5b3b229c354a7df11f9930be012e2de0724c6025498175
 DIST gcalctool-5.32.2.tar.bz2 1178049 RMD160 df98f5ff659f8abc877a20e146ea791b7411a8a2 SHA1 a894d910a45a20d4eab1cbd5d4277939145ec64c SHA256 b281cc545f27b37a0fd120366b1be517574d9f505b59dfc34f9860007df0b788
 DIST gcalctool-6.0.2.tar.bz2 1275979 RMD160 c67336636993dba61deddf231c17a932cb55625d SHA1 78285eeed61d9501e7534161b14eec67a385890b SHA256 63190fde1be5202ab43774785b5521d8f11592c6a9e125673028c5ac235c9316
-EBUILD gcalctool-5.32.2.ebuild 887 RMD160 f5fd7d599426221aaea4e3cfb203aed2ff006858 SHA1 6ec6dd3b409e28d7457df5acc134ce08a4caec45 SHA256 0a23febd63d67a7615e282c5cdcde9294d0326eb006a619b1616a169d3a0eb09
+EBUILD gcalctool-5.32.2.ebuild 1074 RMD160 341e1a25c77f57d44ea3e53de1927158a2377366 SHA1 7da9a09f758c2a46588b7ce63273cb1c6bafa201 SHA256 628b03443b2dc0b1a4c2b220349826a96fce95fc7328e4681369c5c21f174d4a
 EBUILD gcalctool-6.0.2.ebuild 1047 RMD160 98b931d83291356c3f49651abe7414271560fcc3 SHA1 58f9b4361c908a6f75911566276e0b56d3fa1841 SHA256 222171636e02676f3026364cd83cfe0f533764dce82f564c2b47981c6d8c4cd1
-MISC ChangeLog 27271 RMD160 fcbfab301fcfeea287f2fd45b9fb392b1d45873b SHA1 e97c67defe5e6155a9df61b2f7ee98fac6441247 SHA256 cb2062cd93fbb2c3bd2f19e43da9e3492c5c877b44ff4afd9d38bb0367d45dc8
+MISC ChangeLog 27491 RMD160 04c2e8bb5d28f11b30f10106fd0f0ba6f39d092a SHA1 ffac30190553bf0d45d2bdbb4cf820f63f641311 SHA256 e59d47f60f92dd4961f6fd9d3c3dbf4affce5b22588ac3de06508eda4b6b2d1a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOTkcCAAoJEO/kOhxWD91kfbEQAKDTV8qpzURJsNNMIn0DkO27
-DgkMOaWaJArQbu5RCn5DojcuQ3J1sc4zAyCjmx4+MjJJjNq/WAcun+mV4bQf2xfq
-zNqDYE0eOrGPceks1KwrsRX4FUaZb8Uzccwpc11yqRcEumY7VeKnpFHsWHz8ANcD
-gZkyGQPEtrct/a+dDQ6lZMJpwkb8JcasX5G1216It2WMeqlfGNTn2mBqq3mwrvuD
-UwIbc5JhamCGugkvtVn3PDQaPbW2BavuE2xZIsMdvHPsgW28ZRrZVY60S/0/FObG
-c4y0DtWVpqxmPgUEpnuuqr/kWgBnkkwrcs7C6Cypxclbv8UQgxMY0NcWuea9VLo+
-w2jI7YObWJMqM2bvRvbK/71NOJyXoATCdXqriStO/DWapeUNt/2JAdql013tRS9R
-mQGf6CEoei4DtAKWG6sK/HtTwdb6HF+dApZaq3mLQwhRQlfNocxHhXP/G5Mkl7h0
-MN8enGjitUoXkTB9Km/sg1tsErohm35KKfv2EQa7u59QLN0cL2lb4X12HlNElst2
-l7lvys6H9doR/m+p4qaj69AaCdV6kZVdHcYwpaS3/kyG76wvvzV+U9o0zfU+rZrM
-a8QHIhO4CWm8MD8adUr64xEwFX10d3gN7TArx4/PuKMuHY1fXhTXqxHnWA2KIXcL
-NyVc6jOP5lCsKVahhqtY
-=u3Ms
+iEYEARECAAYFAk5se3QACgkQCaWpQKGI+9T5igCfWYtrGFJNw9z5pgI9Lfj5Dwgr
+eHEAn17Obs8FhpRsTVHaJgqg2EfzyUgO
+=Bz1B
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gcalctool/files/gcalctool-5.32.2-missing-header.patch b/gnome-extra/gcalctool/files/gcalctool-5.32.2-missing-header.patch
new file mode 100644
index 000000000000..b7018e4b42d1
--- /dev/null
+++ b/gnome-extra/gcalctool/files/gcalctool-5.32.2-missing-header.patch
@@ -0,0 +1,10 @@
+--- src/gcalctool.c~	2010-10-15 01:38:18.000000000 +0200
++++ src/gcalctool.c	2011-09-11 11:03:52.603120598 +0200
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <locale.h>
+ 
+ #include "currency.h"
+ #include "unittest.h"
diff --git a/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild b/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild
index 4d8a7cff1e73..998834e75699 100644
--- a/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild,v 1.7 2011/03/23 08:11:09 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-5.32.2.ebuild,v 1.8 2011/09/11 09:12:14 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="A calculator application for GNOME"
 HOMEPAGE="http://live.gnome.org/Gcalctool http://calctool.sourceforge.net/"
@@ -31,3 +32,10 @@ pkg_setup() {
 		--with-gtk=2.0"
 	DOCS="AUTHORS ChangeLog* NEWS README"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix compilation problems due missing header, bug #356563
+	epatch "${FILESDIR}/${PN}-5.32.2-missing-header.patch"
+}