我做了fcitx-3.0.0test在FreeBSD的patch

哈蜜瓜

diff -uNr fcitx-3.0.0.orig/configure fcitx-3.0.0/configure
--- fcitx-3.0.0.orig/configure        Tue Jun  1 23:31:22 2004
+++ fcitx-3.0.0/configure        Tue Jun  8 23:42:08 2004
@@ -4128,6 +4128,15 @@
     echo "$as_meLINENO: result: Linux ($host) found." >&5
echo "${ECHO_T}Linux ($host) found." >&6
     ;;
+  *-freebsd* )
+   echo "$as_meLINENO: result: FreeBSD ($host) found." >&5
+   echo "${ECHO_T}freebsd ($host) found." >&6
+    cat >>src/MyErrorsHandlers.h <<\_ACEOF
+#define freebsd 1
+_ACEOF
+                                                                                                
+    LIBS="$LIBS -liconv"
+    ;;
   *-darwin* )
     echo "$as_meLINENO: result: Darwin (Mac OS X) ($host) found." >&5
echo "${ECHO_T}Darwin (Mac OS X) ($host) found." >&6
diff -uNr fcitx-3.0.0.orig/data/Makefile.in fcitx-3.0.0/data/Makefile.in
--- fcitx-3.0.0.orig/data/Makefile.in        Tue Jun  1 23:31:17 2004
+++ fcitx-3.0.0/data/Makefile.in        Wed Jun  9 01:13:18 2004
@@ -83,7 +83,7 @@
am__quote = @am__quote@
install_sh = @install_sh@
tabledir = $(pkgdatadir)/data
-table_DATA = erbi.mb punc.mb pybase.mb py.mb pyphrase.mb pySym.mb sp.dat wbx.mb
+table_DATA = erbi.mb punc.mb pybase.mb py.mb pyphrase.mb pySym.mb sp.dat wbx.mb tables.conf
EXTRA_DIST = $(table_DATA)
subdir = data
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff -uNr fcitx-3.0.0.orig/lib/IMConn.c fcitx-3.0.0/lib/IMConn.c
--- fcitx-3.0.0.orig/lib/IMConn.c        Wed Apr 14 11:54:12 2004
+++ fcitx-3.0.0/lib/IMConn.c        Tue Jun  8 23:21:48 2004
@@ -31,9 +31,9 @@

#include <X11/Xlib.h>
#if defined(DARWIN)
-#include <sys/malloc.h>
+#include <sys/stdlib.h>
#else
-#include <malloc.h>
+#include <stdlib.h>
#endif
#include <string.h>
#include "IMdkit.h"
diff -uNr fcitx-3.0.0.orig/src/MyErrorsHandlers.c fcitx-3.0.0/src/MyErrorsHandlers.c
--- fcitx-3.0.0.orig/src/MyErrorsHandlers.c        Thu Jun  3 01:22:32 2004
+++ fcitx-3.0.0/src/MyErrorsHandlers.c        Tue Jun  8 23:42:41 2004
@@ -5,6 +5,8 @@
#include <stdlib.h>
#if defined(DARWIN)
#include <sys/wait.h>
+#elif defined(freebsd)
+#include <sys/wait.h>
#else
#include <wait.h>
#endif
diff -uNr fcitx-3.0.0.orig/src/ui.c fcitx-3.0.0/src/ui.c
--- fcitx-3.0.0.orig/src/ui.c        Fri Jun  4 00:32:34 2004
+++ fcitx-3.0.0/src/ui.c        Tue Jun  8 22:38:07 2004
@@ -6,9 +6,9 @@
#include <stdlib.h>
#include <string.h>
#if defined(DARWIN)
-#include <sys/malloc.h>
+#include <sys/stdlib.h>
#else
-#include <malloc.h>
+#include <stdlib.h>
#endif
#include <iconv.h>

@@ -298,7 +298,7 @@
     l2 = 99;
     ps = str1;

-    l1 = iconv (convUTF8, (char **) &str, &l1, &ps, &l2);
+    l1 = iconv (convUTF8, (const char **) &str, &l1, &ps, &l2);
     *ps = '\0';
     XftTextExtentsUtf8 (dpy, font, str1, strlen (str1), &extents);

@@ -321,7 +321,7 @@
     ps2 = str2;
     ps1 = str1;

-    l1 = iconv (convUTF8, (char **) &ps1, &l1, &ps2, &l2);
+    l1 = iconv (convUTF8, (const char **) &ps1, &l1, &ps2, &l2);

     XftTextExtentsUtf8 (dpy, font, str2, strlen (str2), &extents);

@@ -374,7 +374,7 @@
     l2 = 99;
     ps = strOutput;

-    l1 = iconv (convUTF8, (char **) (&str), &l1, &ps, &l2);
+    l1 = iconv (convUTF8, (const char **) (&str), &l1, &ps, &l2);

     renderColor.red = color.red;
     renderColor.green = color.green;
diff -uNr fcitx-3.0.0.orig/src/xim.c fcitx-3.0.0/src/xim.c
--- fcitx-3.0.0.orig/src/xim.c        Thu Jun  3 21:13:47 2004
+++ fcitx-3.0.0/src/xim.c        Tue Jun  8 22:38:34 2004
@@ -350,7 +350,7 @@
        ps = strOutput;
        l1 = strlen (strHZ);
        l2 = 299;
-        iconv (convUTF8, (char **) (&strHZ), (size_t *) & l1, &ps, (size_t *) & l2);
+        iconv (convUTF8, (const char **) (&strHZ), (size_t *) & l1, &ps, (size_t *) & l2);
        *ps = '\0';
        ps = strOutput;
     }
@@ -395,7 +395,7 @@
     encodings->count_encodings = sizeof (zhEncodings) / sizeof (XIMEncoding) - 1;
     encodings->supported_encodings = zhEncodings;

-    ims = IMOpenIM (dpy, IMModifiers, "Xi18n", IMServerWindow, im_window, IMServerName, imname, IMLocale, "zh_CN.GB18030,zh_CN.GB2312,zh_CN,zh_CN.GBK,zh_CN.UTF-8,en_US.UTF-8", IMServerTransport, "X/", IMInputStyles, input_styles, NULL);
+    ims = IMOpenIM (dpy, IMModifiers, "Xi18n", IMServerWindow, im_window, IMServerName, imname, IMLocale, "zh_CN.GB18030,zh_CN.eucCN,zh_CN,zh_CN.GBK,zh_CN.UTF-8,en_US.UTF-8", IMServerTransport, "X/", IMInputStyles, input_styles, NULL);
     if (ims == (XIMS) NULL) {
        fprintf (stderr, "已经存在另一个同名服务程序 %s\n", imname);
        return False;