Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #277565.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 45 insertions, 8 deletions

diff --git a/app-i18n/x-unikey/ChangeLog b/app-i18n/x-unikey/ChangeLog
index a3d5ed15616c..558e94158606 100644
--- a/app-i18n/x-unikey/ChangeLog
+++ b/app-i18n/x-unikey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/x-unikey
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.20 2008/12/31 14:28:43 matsuu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.21 2009/08/10 11:49:41 ssuominen Exp $
+
+  10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  x-unikey-1.0.4-r1.ebuild, +files/x-unikey-1.0.4-gcc44.patch:
+  Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #277565.
 
 *x-unikey-1.0.4-r1 (31 Dec 2008)
 
diff --git a/app-i18n/x-unikey/Manifest b/app-i18n/x-unikey/Manifest
index 36f55c3df600..fe99d23587bb 100644
--- a/app-i18n/x-unikey/Manifest
+++ b/app-i18n/x-unikey/Manifest
@@ -1,12 +1,13 @@
 AUX 01x-unikey 214 RMD160 25613e5ebe45db8025c94c200eb233e29f857787 SHA1 02965f918c3c0cb037a98b70ac25b61aadbcac0f SHA256 503f1e6e0157ed0764192421a92aea7e4f356f8e733000dd06322ee8e84f0db4
 AUX x-unikey-1.0.4-gcc43.patch 397 RMD160 54bb7a384dde2b8f05f3122c1e91b16bdecf1b16 SHA1 78da822fd32051f4644a8565965abf0456009317 SHA256 e1c98c5eeab86b365174eae9cd2f754f0b0ca7247e7279d0ebe05f6cd8f0e119
+AUX x-unikey-1.0.4-gcc44.patch 995 RMD160 7216136c48bdd4ff641ac1eb5b4d7cb57edfd0d7 SHA1 3cb07856605241ae98d961f7981ee6f7ed8d3fab SHA256 ada679a52b6bdf2c4b6be6012db1f9914d824cc6ccffe01debc6fb98d89cc06f
 AUX x-unikey-1.0.4-gentoo.patch 614 RMD160 a8c22c35b75b9c6b5be84e8c6f238ba3a59a7d99 SHA1 cb0cb0b27342a16cc0ccffd74ced37de2bad9b11 SHA256 648e3e7df95a51ba7c0e1b9fee30ba104ca0c3705138a30a66b12ca92be0bbd9
 DIST x-unikey-0.9.2.tar.bz2 347785 RMD160 e7bafcc67894156947e52979c5576f6c2b3ed7b9 SHA1 11a7d0d3d497401a20359f6e204bdd504a55ac63 SHA256 54c810c23ed51c31e8ed44702eca38358c5864caba95d84049c782f4c241c250
 DIST x-unikey-1.0.4.tar.bz2 561391 RMD160 151254e9e8d32f1386abc6c5e7009b3f5caf8207 SHA1 07deeaa14bde4395824972cc3b9c94afdda8cc34 SHA256 aa7dd444853538bcba0f24c4c19692c34d4553a1df213a260c2628a7116b2dd9
 DIST x-unikey-manual.html 18349 RMD160 07418dbb9371d91ba9758286be5c96489c98b5aa SHA1 62f2044e5e831a2d0044e6366752b4d9dd45b71e SHA256 cbba2ca916c29ec199a9b8b1288d15f40566118161e6ee0623357b7e1f4a98ea
 DIST x-unikey-manual.pdf 211007 RMD160 0463694e7fe3dfd2cdf721e27d664a301e59f923 SHA1 4ef2d80beb6e1b834e5fa159c6f76273370ff1b5 SHA256 43f5a547a91c7ef8c9d66c24da0102b9c0ef5b9ef06ed10bc3871920baac8b8e
 EBUILD x-unikey-0.9.2.ebuild 1468 RMD160 8602b44fbdc1ccb176c54b1fd444df9794dd7317 SHA1 d813506efdf13e03dffe0c5398772f0efa25d1f0 SHA256 6fa0f00753726b8fde113dd5cfce7de3b0884089dd5d9a2b22d6485d2d0a8560
-EBUILD x-unikey-1.0.4-r1.ebuild 2050 RMD160 8e50f14d7de2074a134ba5e8e1220c2209bba69b SHA1 80bf268c4341bae107dbe7bc7599495c0efef2d9 SHA256 5c7db5dcdb4e95c16ed9ccd63f10e96d36ca03f320fab3db39b927227b20557d
+EBUILD x-unikey-1.0.4-r1.ebuild 2092 RMD160 7e03e8a86f54a1a78b1fbb696f9dbc5dc59439fa SHA1 825278ade8c6d63c79bffcc524b5c4e7209a9a16 SHA256 880c054037911340f378115d64ef2b936859c9bac2c92cad88ac9c15150df12f
 EBUILD x-unikey-1.0.4.ebuild 1721 RMD160 9a594c30074b52f498ed1dd7e6377629b6d195e1 SHA1 88d6f8fe6565141a471a934ba4e11e1900caed80 SHA256 cc6f602dcc3f9155bce3029779b39836205cadd78a055005429bc4327569244f
-MISC ChangeLog 2598 RMD160 448dea9deb30b9d486dce44070f51aaa188de08f SHA1 3da25f961ca9144bdd24d88b395c23c29a5fcc5e SHA256 2daafd18daa15a594071a75e8aa54c81f4422c27ef5b661c44a878f2b7ae2b38
+MISC ChangeLog 2777 RMD160 b1043c2e10831625c1eda4dda19b851c5568c2d0 SHA1 b390c8093367b29683d2a448defe63301350f72e SHA256 47b9ef99317417f6b1fe329462cd2a0dfae6f860a0109199e9c401352e51f062
 MISC metadata.xml 158 RMD160 3852afaaf28a37630993c0442eeb16eaee47d0f7 SHA1 2eb582eae6a2477a9ed984ea45f3b5f649954e54 SHA256 18d71c580f82a389887f4970802b5f40e0a2e4c6019117e64268e008dfb81fc8
diff --git a/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc44.patch b/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc44.patch
new file mode 100644
index 000000000000..5e59ca131b70
--- /dev/null
+++ b/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc44.patch
@@ -0,0 +1,31 @@
+diff -ur x-unikey-1.0.4.orig/src/ukengine/mactab.cpp x-unikey-1.0.4/src/ukengine/mactab.cpp
+--- x-unikey-1.0.4.orig/src/ukengine/mactab.cpp	2006-04-09 14:46:02.000000000 +0300
++++ x-unikey-1.0.4/src/ukengine/mactab.cpp	2009-08-10 14:50:50.000000000 +0300
+@@ -287,7 +287,7 @@
+   char key[MAX_MACRO_KEY_LEN];
+   
+   // Parse the input item
+-  char * pos = strchr(item, ':');
++  const char * pos = strchr(item, ':');
+   if (pos == NULL)
+     return -1;
+   int keyLen = (int)(pos - item);
+diff -ur x-unikey-1.0.4.orig/src/ukengine/usrkeymap.cpp x-unikey-1.0.4/src/ukengine/usrkeymap.cpp
+--- x-unikey-1.0.4.orig/src/ukengine/usrkeymap.cpp	2006-04-09 02:31:40.000000000 +0300
++++ x-unikey-1.0.4/src/ukengine/usrkeymap.cpp	2009-08-10 14:48:44.000000000 +0300
+@@ -21,6 +21,8 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include <stdio.h>
++
+ #include "stdafx.h"
+ #include <iostream>
+ using namespace std;
+@@ -262,4 +264,4 @@
+             return i;
+     }
+     return -1;
+-}
+\ No newline at end of file
++}
diff --git a/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild b/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild
index cfd9938c3ff0..c6fb5c19eaa3 100644
--- a/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild
+++ b/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild,v 1.1 2008/12/31 14:28:43 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild,v 1.2 2009/08/10 11:49:41 ssuominen Exp $
 
 inherit autotools eutils multilib
 
@@ -31,8 +31,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 	eautoreconf
 }