diff options
Diffstat (limited to 'textproc/iiimf-x-lib/files')
11 files changed, 76 insertions, 120 deletions
diff --git a/textproc/iiimf-x-lib/files/patch-Makefile b/textproc/iiimf-x-lib/files/patch-Makefile index bcc2cb24a1c8..24542b8ac6b9 100644 --- a/textproc/iiimf-x-lib/files/patch-Makefile +++ b/textproc/iiimf-x-lib/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 = iiimxcf/xiiimp.so ++#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/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4 b/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4 index 8626eeae1fd1..44ee86c035bc 100644 --- a/textproc/iiimf-x-lib/files/patch-acfiles_check_sys.m4 +++ b/textproc/iiimf-x-lib/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/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_Makefile.am b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_Makefile.am new file mode 100644 index 000000000000..661caf2c83f4 --- /dev/null +++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_Makefile.am @@ -0,0 +1,7 @@ +--- iiimxcf/xiiimp.so/Makefile.am.orig Fri May 13 15:42:30 2005 ++++ iiimxcf/xiiimp.so/Makefile.am Fri May 13 15:42:47 2005 +@@ -1,3 +1,3 @@ + AUTOMAKE_OPTIONS = foreign +-ACLOCAL_AMFLAGS = -I ../../acfiles ++ACLOCAL_AMFLAGS = -I %%LOCALBASE%%/share/aclocal -I ../../acfiles + SUBDIRS = iiimp diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac deleted file mode 100644 index 33d427a3c4d0..000000000000 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_configure.ac +++ /dev/null @@ -1,21 +0,0 @@ ---- iiimxcf/xiiimp.so/configure.ac Wed May 7 12:31:34 2003 -+++ iiimxcf/xiiimp.so/configure.ac Wed Feb 16 21:06:50 2005 -@@ -71,15 +71,15 @@ - - COMMON_INCLUDE='-I$(IM_INCLUDEDIR) -I$(IM_INCLUDEDIR)/iiimp' - - CFLAGS="${COMMON_INCLUDE} ${COMMON_CXX_CFLAGS} ${COMMON_CFLAGS} \ - ${DEBUG_CXX_CFLAGS} ${DEBUG_CFLAGS} \ -- ${THREAD_COMMON_CXX_CFLAGS}" -+ ${THREAD_COMMON_CXX_CFLAGS} ${CFLAGS}" - - CXXFLAGS="${COMMON_INCLUDE} ${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}" - - dnl -------------------------------------------------------------------------------- - dnl Section 6: compilation test diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am index e9f06efa8ade..2b33855ddde3 100644 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am +++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_Makefile.am @@ -1,21 +1,13 @@ ---- iiimxcf/xiiimp.so/iiimp/Makefile.am.orig Tue Mar 23 07:37:51 2004 -+++ iiimxcf/xiiimp.so/iiimp/Makefile.am Thu Mar 3 00:37:54 2005 -@@ -1,15 +1,14 @@ - moduledir = $(IMDIR) - xiiimp_la_CFLAGS = $(X_CFLAGS) -I$(X_PRIVATEINC) \ - $(SHLIBCFLAGS) $(THREAD_CXX_CFLAGS) \ -- -I$(CSCONV_DIR) -+ -I$(CSCONV_DIR) -DUSE_CSCONV -DIMDIR="\"${IMDIR}\"" - xiiimp_la_LDFLAGS = -rpath $(moduledir) -version-info $(XIIIMP_SOX18N_VERSION) \ -- -module -export-dynamic -no-undefined -+ -module -export-dynamic -no-undefined \ -+ -liiimcf -liiimp - # On GNU/Linux system, libtool does not take care of -no-undefined so that +--- iiimxcf/xiiimp.so/iiimp/Makefile.am.orig Mon May 9 19:38:54 2005 ++++ iiimxcf/xiiimp.so/iiimp/Makefile.am Mon May 9 19:40:25 2005 +@@ -8,8 +8,8 @@ # you have to add the following by yourself to check undefined symbols. # -Wl,-z -Wl,defs xiiimp_la_LIBADD = $(X_LIBS) \ - $(IM_LIBDIR)/iiimcf/libiiimcf.la \ - $(IM_LIBDIR)/iiimp/libiiimp.la \ ++ -liiimcf \ ++ -liiimp \ $(DLOPEN_LIBS) $(THREAD_LIBS) xiiimp_la_SOURCES = \ - genutil.c \ + KeyMap.c \ diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h deleted file mode 100644 index 660c30c0fc1a..000000000000 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_csconv.h +++ /dev/null @@ -1,11 +0,0 @@ ---- iiimxcf/xiiimp.so/iiimp/csconv.h Fri Mar 16 00:52:22 2001 -+++ iiimxcf/xiiimp.so/iiimp/csconv.h Wed Feb 16 20:48:14 2005 -@@ -64,7 +64,7 @@ - # define CSC_BASE_DIR_SYSTEM "/etc/lib/im/csconv/" - #endif /* !CSC_BASE_DIR_SYSTEM */ - #if !defined(CSC_BASE_DIR_DEFAULT) --# define CSC_BASE_DIR_DEFAULT "/usr/lib/im/csconv/" -+# define CSC_BASE_DIR_DEFAULT (IMDIR "/csconv/") - #endif /* !CSC_BASE_DIR_DEFAULT */ - - #define CSC_IS_PATH_ABS(path) (('/' == *(path)) || \ diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimcfFun.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimcfFun.c new file mode 100644 index 000000000000..7085c7be594f --- /dev/null +++ b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimcfFun.c @@ -0,0 +1,12 @@ +--- iiimxcf/xiiimp.so/iiimp/iiimcfFun.c.orig Fri May 13 18:18:29 2005 ++++ iiimxcf/xiiimp.so/iiimp/iiimcfFun.c Fri May 13 18:18:47 2005 +@@ -61,7 +61,9 @@ + #include <iiimcf.h> + #include <langinfo.h> + #include <limits.h> ++#ifndef __FreeBSD__ + #include <values.h> ++#endif + #include <X11/Xlib.h> + #include <X11/Xatom.h> + diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c deleted file mode 100644 index 3b08439ac146..000000000000 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpAux.c +++ /dev/null @@ -1,11 +0,0 @@ ---- iiimxcf/xiiimp.so/iiimp/iiimpAux.c Sat Sep 11 01:41:45 2004 -+++ iiimxcf/xiiimp.so/iiimp/iiimpAux.c Wed Feb 16 20:40:57 2005 -@@ -80,7 +80,7 @@ - #include "trace_message.h" - - --#define AUX_BASE_DIR "/usr/lib/im/" -+#define AUX_BASE_DIR IMDIR - - #if defined(__sparcv9) - #define SPARCV9_DIR "sparcv9/" diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c deleted file mode 100644 index bfeb601a75d0..000000000000 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpConv.c +++ /dev/null @@ -1,11 +0,0 @@ ---- iiimxcf/xiiimp.so/iiimp/iiimpConv.c Wed Apr 28 18:28:59 2004 -+++ iiimxcf/xiiimp.so/iiimp/iiimpConv.c Wed Feb 16 20:41:07 2005 -@@ -68,7 +68,7 @@ - #ifdef USE_CSCONV - #include <dlfcn.h> - #include "csconv.h" --#define CSC_PATH "/usr/lib/im/csconv/csconv.so" -+#define CSC_PATH (IMDIR "/csconv/csconv.so") - #define CSC_OPEN_LOCALE "csconv_open_locale" - #define CSC_OPEN "csconv_open" - #define CSC_CONV "csconv" diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c deleted file mode 100644 index dbbb091828df..000000000000 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpDL.c +++ /dev/null @@ -1,11 +0,0 @@ ---- iiimxcf/xiiimp.so/iiimp/iiimpDL.c Wed May 5 03:55:05 2004 -+++ iiimxcf/xiiimp.so/iiimp/iiimpDL.c Wed Feb 16 20:41:14 2005 -@@ -108,7 +108,7 @@ - } - - #ifndef XLOCALEDIR --#define XLOCALEDIR "/usr/lib/im/modules" -+#define XLOCALEDIR (IMDIR "/modules") - #endif - - static const char* diff --git a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c b/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c deleted file mode 100644 index 2ba2ba2442de..000000000000 --- a/textproc/iiimf-x-lib/files/patch-iiimxcf_xiiimp.so_iiimp_iiimpIM.c +++ /dev/null @@ -1,20 +0,0 @@ ---- iiimxcf/xiiimp.so/iiimp/iiimpIM.c Wed Aug 25 15:09:50 2004 -+++ iiimxcf/xiiimp.so/iiimp/iiimpIM.c Wed Feb 16 22:06:57 2005 -@@ -189,7 +189,7 @@ - }; - - #ifndef IMLOCALEDIR --#define IMLOCALEDIR "/usr/lib/im/locale" -+#define IMLOCALEDIR (IMDIR "/locale") - #endif - - #define iscomment(ch) ((ch) == '\0' || (ch) == '#') -@@ -625,7 +625,7 @@ - if (mod) { - mod += strlen(MODIFIER); - -- if (!strncmp(mod, "iiimp/", 6) || !strncmp(mod, "IIIMP/", 6)) { -+ if (!strncasecmp(mod, "iiimp/", 6)) { - mod += 6; - - if (index(mod, ':')) { |