代人提交一 fcitx 3.1.1 的patch

bubuyu

sinomac.net的站长jeff_yecn无法访问这里，他现在将fcitx 3.1.1移植到了Mac OS X(Darwin)上面: http://www.sinomac.net/downloads/fcitx-3.1.1-1.darwin.tar.gz
另外让我提交一个patch（但...提交到哪里??)

1. diff -urN fcitx-3.1.1.orig/src/Makefile.am fcitx-3.1.1/src/Makefile.am
   
2. --- fcitx-3.1.1.orig/src/Makefile.am    2004-07-16 02:40:17.000000000 -0400
   
3. +++ fcitx-3.1.1/src/Makefile.am 2005-05-03 18:02:26.000000000 -0400
   
4. @@ -1,4 +1,4 @@
   
5. -DEFS = -DPKGDATADIR="$(pkgdatadir)"
   
6. +DEFS = @DEFS@ -DPKGDATADIR="$(pkgdatadir)"
   
7. 
   
8. INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/xpm
   
9. diff -urN fcitx-3.1.1.orig/src/ui.c fcitx-3.1.1/src/ui.c
   
10. --- fcitx-3.1.1.orig/src/ui.c   2005-03-09 00:14:49.000000000 -0500
    
11. +++ fcitx-3.1.1/src/ui.c        2005-05-03 18:06:02.000000000 -0400
    
12. @@ -362,7 +362,7 @@
    
13.      l2 = 99;
    
14.      ps = str1;
    
15. 
    
16. -    l1 = iconv (convUTF8, &str, &l1, &ps, &l2);
    
17. +    l1 = iconv (convUTF8, (ICONV_CONST char **)&str, &l1, &ps, &l2);
    
18.      *ps = '\0';
    
19.      XftTextExtentsUtf8 (dpy, font, (FcChar8 *) str1, strlen (str1), &extents);
    
20.      if (font == xftMainWindowFont)
    
21. @@ -387,7 +387,7 @@
    
22.      ps2 = str2;
    
23.      ps1 = str1;
    
24. 
    
25. -    l1 = iconv (convUTF8, &ps1, &l1, &ps2, &l2);
    
26. +    l1 = iconv (convUTF8, (ICONV_CONST char **)&ps1, &l1, &ps2, &l2);
    
27.      *ps2 = '\0';
    
28. 
    
29.      XftTextExtentsUtf8 (dpy, font, (FcChar8 *) str2, strlen (str2), &extents);
    
30. @@ -440,7 +440,7 @@
    
31.      l1 = strlen (str);
    
32.      l2 = 99;
    
33.      ps = strOutput;
    
34. -    l1 = iconv (convUTF8, &str, &l1, &ps, &l2);
    
35. +    l1 = iconv (convUTF8, (ICONV_CONST char **)&str, &l1, &ps, &l2);
    
36.      *ps = '\0';
    
37. 
    
38.      renderColor.red = color.red;
    
39. diff -urN fcitx-3.1.1.orig/src/xim.c fcitx-3.1.1/src/xim.c
    
40. --- fcitx-3.1.1.orig/src/xim.c  2005-03-21 09:43:59.000000000 -0500
    
41. +++ fcitx-3.1.1/src/xim.c       2005-05-03 18:06:52.000000000 -0400
    
42. @@ -333,7 +333,7 @@
    
43.         ps = strOutput;
    
44.         l1 = strlen (strHZ);
    
45.         l2 = 299;
    
46. -       l1 = iconv (convUTF8, (char **) (&strHZ), &l1, &ps, &l2);
    
47. +       l1 = iconv (convUTF8, (ICONV_CONST char **) (&strHZ), &l1, &ps, &l2);
    
48.         *ps = '\0';
    
49.         ps = strOutput;
    
50.      }

复制代码

Yuking

谢谢，我已经将它合并到现在的代码中