7 files changed, 131 insertions, 77 deletions

diff --git a/chinese/iiimf-le-ude/files/patch-Makefile b/chinese/iiimf-le-ude/files/patch-Makefile
index bcc2cb24a1c8..c13173f534a8 100644
--- a/chinese/iiimf-le-ude/files/patch-Makefile
+++ b/chinese/iiimf-le-ude/files/patch-Makefile
@@ -1,19 +1,47 @@
---- Makefile	Thu Apr  8 03:28:00 2004
-+++ Makefile	Wed Feb 16 14:09:34 2005
-@@ -2,6 +2,7 @@
- AUTOMAKE = automake
- AUTOHEADER = autoheader
- AUTOCONF = autoconf
-+LIBTOOLIZE = libtoolize
+--- Makefile.orig	Mon May  9 15:32:45 2005
++++ Makefile	Mon May  9 15:35:03 2005
+@@ -1,29 +1,31 @@
+ ## deprecated in favour of AUTORECONF
+-#ACLOCAL = aclocal
+-#AUTOMAKE = automake --add-missing --copy
+-#LIBTOOLIZE = libtoolize --force --copy
+-#AUTOHEADER = autoheader
+-#AUTOCONF = autoconf
++ACLOCAL = aclocal19
++AUTOMAKE = automake19 --add-missing --copy
++LIBTOOLIZE = libtoolize15 --force --copy
++AUTOHEADER = autoheader259
++AUTOCONF = autoconf259
+ #CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
+ #             $(LIBTOOLIZE) && \
+ #             $(AUTOHEADER) && \
+ #             $(AUTOMAKE) && \
+ #             $(AUTOCONF)
  
- CONFIG_CMD = $(ACLOCAL) -I $${acfilesdir} && \
-              $(AUTOHEADER) && \
-@@ -21,7 +22,7 @@
+-AUTORECONF = autoreconf
++AUTORECONF = autoreconf259
+ BOOTSTRAP = $(AUTORECONF) --install --force
+ INTL_CMD = glib-gettextize -f && intltoolize --copy --force --automake
  
- update-acfiles:
- 	cd acfiles && \
--        $(ACLOCAL) && $(AUTOMAKE) --add-missing --copy && libtoolize --force --copy && \
-+        $(ACLOCAL) $(ACLOCAL_DIR) && $(AUTOMAKE) --add-missing --copy && $(LIBTOOLIZE) --force --copy && \
-         rm -f Makefile.in aclocal.m4
+-CONFIG_FLAGS = --prefix=/usr --sysconfdir=/etc --localstatedir=/var
++CONFIG_FLAGS = --prefix=%%PREFIX%% --sysconfdir=%%LOCALBASE%%/etc --localstatedir=/var
+ 
+-INTLDIRS = iiimgcf gnome-im-switcher
++#INTLDIRS = iiimgcf gnome-im-switcher
+ 
+-BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
+-            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
+-            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
+-            iiimgcf gnome-im-switcher doc
++BUILDDIRS = leif
++#BUILDDIRS = lib/CSConv lib/EIMIL lib/iiimp lib/iiimcf \
++#            iiimsf leif leif/sun_le_korea leif/sch_le_sun leif/tch_le_sun \
++#            iiimxcf/xiiimp.so iiimxcf/htt_xbe \
++#            iiimgcf gnome-im-switcher doc
+ 
+-CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
++CONFIGDIRS = $(BUILDDIRS)
++#CONFIGDIRS = $(BUILDDIRS) leif/m17n_le leif/thai_le_sun
+ 
+ all: compile
  
- config:
diff --git a/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4 b/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4
index 8626eeae1fd1..44ee86c035bc 100644
--- a/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4
+++ b/chinese/iiimf-le-ude/files/patch-acfiles_check_sys.m4
@@ -1,10 +1,12 @@
---- acfiles/check_sys.m4.orig	Tue Sep 14 13:31:27 2004
-+++ acfiles/check_sys.m4	Wed Mar  2 08:39:25 2005
-@@ -203,6 +203,11 @@
+--- acfiles/check_sys.m4.orig	Mon May  9 15:28:20 2005
++++ acfiles/check_sys.m4	Mon May  9 15:32:07 2005
+@@ -203,6 +203,13 @@
  		    CXX=${CC}
  		fi
  		;;
 +	    cc*:*)
++		DEBUG_CFLAGS="${DEBUG_CFLAGS} -ggdb"
++		DEBUG_CXXFLAGS="${DEBUG_CXXFLAGS} -g"
 +		COMMON_CFLAGS="${COMMON_CFLAGS} -Wall"
 +		SHLIBCFLAGS='-fpic'
 +		SHLIBLDFLAGS='-shared'
@@ -12,7 +14,7 @@
  	    *)
  		DEBUG_CXX_CFLAGS="${DEBUG_CXX_CFLAGS} -g"
  		;;
-@@ -249,8 +254,8 @@
+@@ -249,8 +256,8 @@
  		COMMON_CXX_CFLAGS="${COMMON_CXX_CFLAGS} -DLinux"
  		;;
  	    *freebsd*)
@@ -23,7 +25,7 @@
  		;;
  	esac
  
-@@ -288,9 +293,9 @@
+@@ -288,9 +295,9 @@
  		THREAD_CXX_CFLAGS="-mt"
  		HAVE_THREAD="uithread"
  		;;
diff --git a/chinese/iiimf-le-ude/files/patch-leif_Makefile.am b/chinese/iiimf-le-ude/files/patch-leif_Makefile.am
new file mode 100644
index 000000000000..710a4d8844f9
--- /dev/null
+++ b/chinese/iiimf-le-ude/files/patch-leif_Makefile.am
@@ -0,0 +1,8 @@
+--- leif/Makefile.am.orig	Fri May 13 15:45:41 2005
++++ leif/Makefile.am	Fri May 13 15:46:03 2005
+@@ -1,4 +1,4 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = $(LE_TARGETS)
+ 
+-ACLOCAL_AMFLAGS = -I ../acfiles
++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../acfiles
diff --git a/chinese/iiimf-le-ude/files/patch-leif_configure.ac b/chinese/iiimf-le-ude/files/patch-leif_configure.ac
index cfce1eedb62a..d899318fb5d8 100644
--- a/chinese/iiimf-le-ude/files/patch-leif_configure.ac
+++ b/chinese/iiimf-le-ude/files/patch-leif_configure.ac
@@ -1,54 +1,28 @@
---- leif/configure.ac.orig	Wed Oct  6 23:00:36 2004
-+++ leif/configure.ac	Thu Mar 24 17:44:36 2005
-@@ -44,15 +44,15 @@
+--- leif/configure.ac.orig	Wed May 11 13:01:08 2005
++++ leif/configure.ac	Wed May 11 13:02:22 2005
+@@ -75,16 +75,16 @@
  
- IM_CHECK_SYSTEM
- IM_CHECK_DLOPEN
--IM_CHECK_CANNA
--IM_CHECK_FREEWNN
-+dnl IM_CHECK_CANNA
-+dnl IM_CHECK_FREEWNN
+ LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
  
--IM_CHECK_X
--IM_CHECK_GTK
--IM_CHECK_MOTIF
--PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
--AC_SUBST(GTK2_CFLAGS)
--AC_SUBST(GTK2_LIBS)
-+dnl IM_CHECK_X
-+dnl IM_CHECK_GTK
-+dnl IM_CHECK_MOTIF
-+dnl PKG_CHECK_MODULES(GTK2, gtk+-2.0 gtk+-x11-2.0)
-+dnl AC_SUBST(GTK2_CFLAGS)
-+dnl AC_SUBST(GTK2_LIBS)
+-LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul fop_test"
++LE_TARGETS="ude"
  
- dnl --------------------------------------------------------------------------------
- dnl                      Section 5: compilation options
-@@ -63,23 +63,15 @@
- 
- CFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \
-         ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \
--        ${THREAD_COMMON_CXX_CFLAGS}"
-+        ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}"
- 
- CXXFLAGS="${COMMON_CXX_CFLAGS} ${COMMON_CXXFLAGS} \
-           ${DEBUG_CXX_CFLAGS} ${DEBUG_CXXFLAGS} \
--          ${THREAD_COMMON_CXX_CFLAGS}"
-+          ${THREAD_COMMON_CXX_CFLAGS} ${CXXFLAGS}"
- 
--LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS}"
-+LDFLAGS="${COMMON_LDFLAGS} ${THREAD_LDFLAGS} ${LDFLAGS}"
- 
--LE_TARGETS="default template sampleja sampleja2 sampleja3 newpy testEIMIL unit hangul chewing"
--
 -IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
+-IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
 -IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
-+LE_TARGETS="udt"
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CANNA, canna)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_FREEWNN, freewnn)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_CHEWING, chewing)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_X, sampleja3/xaux_common)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_GTK, sampleja3/xaux_gtk)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, newpy/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja/xaux)
++#IM_ADD_TARGET(LE_TARGETS, HAVE_MOTIF, sampleja3/xaux_motif)
  
  dnl --------------------------------------------------------------------------------
  dnl                       Section 6: compilation test
diff --git a/chinese/iiimf-le-ude/files/patch-leif_ude_IMHandler.c b/chinese/iiimf-le-ude/files/patch-leif_ude_IMHandler.c
new file mode 100644
index 000000000000..99f323c55cb1
--- /dev/null
+++ b/chinese/iiimf-le-ude/files/patch-leif_ude_IMHandler.c
@@ -0,0 +1,11 @@
+--- leif/ude/IMHandler.c.orig	Wed May 18 03:17:57 2005
++++ leif/ude/IMHandler.c	Wed May 18 03:18:24 2005
+@@ -71,7 +71,7 @@
+ 	if(ct_list == NULL) {
+ 
+ #ifndef WIN32
+-		strcat(ct_path, "/../locale/zh_CN/ude/data");
++		strcat(ct_path, "data");
+ #else
+ 		strcat(ct_path, "\\..\\locale\\zh_CN\\ude\\data");
+ #endif
diff --git a/chinese/iiimf-le-ude/files/patch-leif_ude_Makefile.am b/chinese/iiimf-le-ude/files/patch-leif_ude_Makefile.am
index 6d80b3552733..474d850529be 100644
--- a/chinese/iiimf-le-ude/files/patch-leif_ude_Makefile.am
+++ b/chinese/iiimf-le-ude/files/patch-leif_ude_Makefile.am
@@ -1,11 +1,24 @@
---- leif/ude/Makefile.am.orig	Thu Mar  3 00:07:57 2005
-+++ leif/ude/Makefile.am	Thu Mar  3 00:08:15 2005
-@@ -2,7 +2,7 @@
- datadir = $(IM_LOCALEDIR)/zh_CN/ude/data
- udengine_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
+--- leif/ude/Makefile.am.orig	Thu Apr 14 00:30:34 2005
++++ leif/ude/Makefile.am	Wed May 18 02:42:34 2005
+@@ -1,13 +1,14 @@
+-LE_FILES = udengine.so
+-datadir = $(IM_LEIFDIR)/ude/data
+-udengine_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
++LENAME = ude
++LE_FILES = ude.so
++datadir = $(IM_LEIFDIR)/$(LENAME)/data
++ude_la_CFLAGS = $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \
                       -DNO_COLOR_FEEDBACK -DNO_CARET_NEGO \
--                     -I$(IM_INCLUDEDIR)/iml
-+                     -I$(IM_INCLUDEDIR)/iml -DIMDIR="\"${IMDIR}\""
- udengine_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
- udengine_la_LIBADD = $(THREAD_LIBS)
- udengine_la_SOURCES = UDEngine.c Converter.c IMHandler.c \
+                      -I$(IM_INCLUDEDIR)/iml
+-udengine_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
+-udengine_la_LIBADD = $(THREAD_LIBS)
+-udengine_la_SOURCES = UDEngine.c Converter.c IMHandler.c \
++ude_la_LDFLAGS = -module -rpath $(IM_LEIFDIR) $(SHLIBLDFLAGS) $(THREAD_LDFLAGS)
++ude_la_LIBADD = $(THREAD_LIBS)
++ude_la_SOURCES = UDEngine.c Converter.c IMHandler.c \
+                       CodeTable.c MakeCodeTable.c
+-noinst_LTLIBRARIES = udengine.la
++noinst_LTLIBRARIES = ude.la
+ data_DATA = data/pinyin.mb
+ 
+ include $(top_srcdir)/install-leif.mak
diff --git a/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c b/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c
index c70fc4bea433..a645ed5fd6cf 100644
--- a/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c
+++ b/chinese/iiimf-le-ude/files/patch-leif_ude_UDEngine.c
@@ -1,11 +1,29 @@
---- leif/ude/UDEngine.c	Fri Mar 16 00:52:22 2001
-+++ leif/ude/UDEngine.c	Wed Feb 16 20:47:14 2005
-@@ -302,7 +302,7 @@
+--- leif/ude/UDEngine.c.orig	Fri Mar 16 00:52:22 2001
++++ leif/ude/UDEngine.c	Wed May 18 03:06:05 2005
+@@ -94,7 +94,7 @@
+ UTFCHAR zhhrn_string[] = {0x7b80, 0x4f53, 0x4e2d, 0x872d, 0x0};
+ 
+ static IMLEName lename = {
+-    "udengine", lename_string	/* LE id, HRN */
++    "ude", lename_string	/* LE id, HRN */
+ };
+ 
+ static IMLocale locales[] = {
+@@ -295,14 +295,14 @@
+     objects = (IMObjectDescriptorStruct *) calloc(2, sizeof(IMObjectDescriptorStruct));
+     l = objects;
+ 
+-    l->leid = "udengine";       /* engine id */
++    l->leid = "ude";       /* engine id */
+     l->type = IM_DOWNLOADINGOBJECT_JARGUI_TYPE; /* object type */
+     l->name = (UTFCHAR *) calloc(1, sizeof(UTFCHAR) * (UTFCHARLen(aux_name_panel) + 1));
+     UTFCHARCpy(l->name, aux_name_panel);
      l->name_length = UTFCHARLen(aux_name_panel);
      l->domain = "com.sun.udengine";
-     l->scope = "udengine";      
+-    l->scope = "udengine";      
 -    l->path = "/usr/lib/im/locale/zh_CN/udengine/udengine_obj.jar";  /* path */
-+    l->path = (IMDIR "/locale/zh_CN/udengine/udengine_obj.jar");  /* path */
++    l->scope = "ude";      
++    l->path = "%%PREFIX%%" "/lib/iiim/le/ude/ude.so";  /* path */
      l->signature = "";
      l->basepath = NULL;         /* only for CCDEF */
      l->encoding = NULL;         /* only for CCDEF */