[gentoo-commits] gentoo-x86 commit in app-i18n/x-unikey/files: x-unikey-1.0.4-gcc44.patch

[gentoo-commits] gentoo-x86 commit in app-i18n/x-unikey/files: x-unikey-1.0.4-gcc44.patch

[Samuli Suominen (ssuominen)]

ssuominen    09/08/10 11:49:41

  Added:                x-unikey-1.0.4-gcc44.patch
  Log:
  Fix building with GCC 4.4+ and GLIBC 2.10+ wrt #277565.
  (Portage version: 2.2_rc36/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-i18n/x-unikey/files/x-unikey-1.0.4-gcc44.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc44.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/x-unikey/files/x-unikey-1.0.4-gcc44.patch?rev=1.1&content-type=text/plain

Index: x-unikey-1.0.4-gcc44.patch
===================================================================
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
+}