3 files changed, 67 insertions, 56 deletions
diff --git a/korean/iiimf-le-hangul/files/patch-Makefile b/korean/iiimf-le-hangul/files/patch-Makefile
index bcc2cb24a1c8..c13173f534a8 100644
--- a/korean/iiimf-le-hangul/files/patch-Makefile
+++ b/korean/iiimf-le-hangul/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/korean/iiimf-le-hangul/files/patch-leif_Makefile.am b/korean/iiimf-le-hangul/files/patch-leif_Makefile.am
new file mode 100644
index 000000000000..710a4d8844f9
--- /dev/null
+++ b/korean/iiimf-le-hangul/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/korean/iiimf-le-hangul/files/patch-leif_configure.ac b/korean/iiimf-le-hangul/files/patch-leif_configure.ac
index 8ff937c6020d..e9eeed725ade 100644
--- a/korean/iiimf-le-hangul/files/patch-leif_configure.ac
+++ b/korean/iiimf-le-hangul/files/patch-leif_configure.ac
@@ -1,53 +1,28 @@
---- leif/configure.ac.orig	Wed Oct  6 23:00:36 2004
-+++ leif/configure.ac	Thu Mar 24 18:06:01 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_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)
- 
- 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 fop_test"
++LE_TARGETS="hangul"
  
--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="hangul"
++#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