Fix broken compilation on glibc-2.7 (#203787).

Package-Manager: portage-2.1.3.19

4 files changed, 36 insertions, 13 deletions

diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index f170108aab0e..5a81397b8461 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-mobilephone/gnokii
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.66 2008/01/01 15:44:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.67 2008/01/01 16:16:36 mrness Exp $
+
+  01 Jan 2008; Alin Năstac <mrness@gentoo.org>
+  +files/gnokii-0.6.22-locale.patch, gnokii-0.6.22-r1.ebuild:
+  Fix broken compilation on glibc-2.7 (#203787).
 
   01 Jan 2008; Markus Meier <maekke@gentoo.org> gnokii-0.6.22-r1.ebuild:
   x86 stable, bug #203745
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index 8480df874c8d..945939d10cc9 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -9,6 +9,10 @@ AUX gnokii-0.6.18-xlibpath.patch 961 RMD160 08a99622180929e1f8dd4c851d9731e7ad83
 MD5 55d3db3abebe36b3211a44865cead619 files/gnokii-0.6.18-xlibpath.patch 961
 RMD160 08a99622180929e1f8dd4c851d9731e7ad83763f files/gnokii-0.6.18-xlibpath.patch 961
 SHA256 647578b785d1c5e0ec35c81e6e68f9a44269c6e6d2a5fe53cfc0660ad90f6b9f files/gnokii-0.6.18-xlibpath.patch 961
+AUX gnokii-0.6.22-locale.patch 388 RMD160 dd6e6c977154c62ed51839fa64a11e4686cdbd81 SHA1 d71db99b61afe94f953398f64a9c41db78885109 SHA256 ea4a92a9c8fdc41343c72e7886f926cb8a48c544b1262e25a9b8808b36d7e6c0
+MD5 9da15d65f1e88f469701718c072b493f files/gnokii-0.6.22-locale.patch 388
+RMD160 dd6e6c977154c62ed51839fa64a11e4686cdbd81 files/gnokii-0.6.22-locale.patch 388
+SHA256 ea4a92a9c8fdc41343c72e7886f926cb8a48c544b1262e25a9b8808b36d7e6c0 files/gnokii-0.6.22-locale.patch 388
 DIST gnokii-0.6.14.tar.bz2 1546845 RMD160 471689e6ccbb2a81c0eb27a073e27f88ed71e3df SHA1 df3c5a4fd96d84e81feee8ded2bdf112269e78f3 SHA256 cea63cddf79864d306198c7a84091af0b4685816b352ae253a3e2bfac5e67cb7
 DIST gnokii-0.6.18.tar.bz2 1756016 RMD160 8f789f18f84229d49d04dff05d329f605d2643bf SHA1 fbf8c856ee1fee6df1931055e410e463419e5e11 SHA256 9b47279e0659a3c1e4bd35c48112dcbd2e4c30038bb589de1dab6f580827ada5
 DIST gnokii-0.6.19.tar.bz2 1742929 RMD160 53ba65c0ced672c8063b758294b91bca2eea0bfd SHA1 da3cefb6cd3a6b829aa02e0d276298ba5c56d95f SHA256 06fc2c7d728084a102b2d0762bd2846a4f7bfb1a8d0f17b409623bbfd4ab129c
@@ -25,14 +29,14 @@ EBUILD gnokii-0.6.19.ebuild 3533 RMD160 d4aaa7ec6d47fe64833c63f1104156924f001a53
 MD5 70d933c7af26e81426b4796847caf12a gnokii-0.6.19.ebuild 3533
 RMD160 d4aaa7ec6d47fe64833c63f1104156924f001a53 gnokii-0.6.19.ebuild 3533
 SHA256 355177fd18a7e25ca1ad20d02f812fb92fc26b80bfb62baaa744fa48134847dd gnokii-0.6.19.ebuild 3533
-EBUILD gnokii-0.6.22-r1.ebuild 4111 RMD160 30abb93604e86f7263c939f34221e9e0b5af4830 SHA1 c86b484883a87636c1b20a3209b55ac572ff5f78 SHA256 3b5038c257029061bd8ff24e79e2dcf3564bef3657d0559243266d340edbb30b
-MD5 69863379e3fa6e9407939371a4cc59ce gnokii-0.6.22-r1.ebuild 4111
-RMD160 30abb93604e86f7263c939f34221e9e0b5af4830 gnokii-0.6.22-r1.ebuild 4111
-SHA256 3b5038c257029061bd8ff24e79e2dcf3564bef3657d0559243266d340edbb30b gnokii-0.6.22-r1.ebuild 4111
-MISC ChangeLog 13383 RMD160 414366586a7e999eed36a14495de6b273d26370a SHA1 2286692e18c04e411d89de34df5590aa2f9eff7b SHA256 a217c558f26f632cbae4734b8198b9a2c102773367b4fdd4f84cc93ee8043a43
-MD5 117474cb010b38e950d41e17258f8ab3 ChangeLog 13383
-RMD160 414366586a7e999eed36a14495de6b273d26370a ChangeLog 13383
-SHA256 a217c558f26f632cbae4734b8198b9a2c102773367b4fdd4f84cc93ee8043a43 ChangeLog 13383
+EBUILD gnokii-0.6.22-r1.ebuild 4151 RMD160 23954ee060c0737d51a3eefd08c553988102409e SHA1 e28fbbe64bf6f705c1eacfbbe07b029ab94c98bf SHA256 a33b4e253a3170e1f91eccdf137018427c827f59c59fb3eab02e7f592ef1007e
+MD5 68a3572d821369adaa7b8c2d5c624bc9 gnokii-0.6.22-r1.ebuild 4151
+RMD160 23954ee060c0737d51a3eefd08c553988102409e gnokii-0.6.22-r1.ebuild 4151
+SHA256 a33b4e253a3170e1f91eccdf137018427c827f59c59fb3eab02e7f592ef1007e gnokii-0.6.22-r1.ebuild 4151
+MISC ChangeLog 13543 RMD160 937b830ccc14886b49365aba66186dcf8aa20fb6 SHA1 1efe01887b23c2c7726d961bb76494f7b9e1140f SHA256 8c62d5f6554063f6173b13315ed3f94b304ac8fb2a7247c87c7d7ff1f6972a8b
+MD5 20e8e93c7f97d06e83a802f1825c0f5c ChangeLog 13543
+RMD160 937b830ccc14886b49365aba66186dcf8aa20fb6 ChangeLog 13543
+SHA256 8c62d5f6554063f6173b13315ed3f94b304ac8fb2a7247c87c7d7ff1f6972a8b ChangeLog 13543
 MISC metadata.xml 467 RMD160 f4f42815e8e048a9393a44da04ca01dac19c2cb5 SHA1 ffe70f8fab241fb7d19fb7807e6a04a5134fee6e SHA256 568184cf4297917d644b08f231861be42f00830d26e6c3789e3a4d65016430d6
 MD5 01ec5e34cbf064fdf9a0862d481b01d9 metadata.xml 467
 RMD160 f4f42815e8e048a9393a44da04ca01dac19c2cb5 metadata.xml 467
@@ -52,7 +56,7 @@ SHA256 9255270a9e122b893e0cbd25b38e004feca58b672a7f85cceae2b61f6be2e523 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkd6YEcACgkQkKaRLQcq0GLtYQCeJIuSjCxD/i3U7a4eP2XL2KbY
-0M0AnjpjmkxAjHeXSwO34f4o5W1cVwBB
-=qLRd
+iEYEARECAAYFAkd6Z3EACgkQ+fWpoTWIA9FheACePB9aY9oBJxH+IfcikrpfejP7
+OtIAnjRZ4FEnfbckxCD9Aa/qmjdcbPiN
+=6A+M
 -----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gnokii/files/gnokii-0.6.22-locale.patch b/app-mobilephone/gnokii/files/gnokii-0.6.22-locale.patch
new file mode 100644
index 000000000000..e2cbbc6638a5
--- /dev/null
+++ b/app-mobilephone/gnokii/files/gnokii-0.6.22-locale.patch
@@ -0,0 +1,14 @@
+diff -Nru gnokii-0.6.22.orig/common/gsm-sms.c gnokii-0.6.22/common/gsm-sms.c
+--- gnokii-0.6.22.orig/common/gsm-sms.c	2007-11-24 13:31:01.000000000 +0200
++++ gnokii-0.6.22/common/gsm-sms.c	2008-01-01 18:11:40.000000000 +0200
+@@ -39,6 +39,10 @@
+ #include "gnokii-internal.h"
+ #include "gnokii.h"
+ 
++#ifdef ENABLE_NLS
++#  include <locale.h>
++#endif
++
+ #include "sms-nokia.h"
+ 
+ #undef ERROR
diff --git a/app-mobilephone/gnokii/gnokii-0.6.22-r1.ebuild b/app-mobilephone/gnokii/gnokii-0.6.22-r1.ebuild
index 2c1bcab03797..eceeb663ea09 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.22-r1.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.22-r1.ebuild,v 1.2 2008/01/01 15:44:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.22-r1.ebuild,v 1.3 2008/01/01 16:16:36 mrness Exp $
 
 WANT_AUTOMAKE="none"
 
@@ -39,6 +39,7 @@ IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-locale.patch
 
 	if use sms ; then
 		local MY_SMSD_DB_OBJS="file.lo"