summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-terms/mlterm/files')
-rw-r--r--x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch10
-rw-r--r--x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch55
-rw-r--r--x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch13
3 files changed, 0 insertions, 78 deletions
diff --git a/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch b/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch
deleted file mode 100644
index e69a2c93206b..000000000000
--- a/x11-terms/mlterm/files/mlterm-2.9.4-uim15-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/inputmethod/uim/im_uim.c 2008-05-25 23:41:46.871924640 +0900
-+++ b/inputmethod/uim/im_uim.c 2008-05-25 23:42:34.149923480 +0900
-@@ -35,6 +35,7 @@
- #include <uim-helper.h>
- #include <uim-im-switcher.h>
-
-+#include <stdio.h>
- #include <X11/keysym.h> /* XK_xxx */
- #include <kiklib/kik_mem.h> /* malloc/alloca/free */
- #include <kiklib/kik_str.h> /* kik_str_alloca_dup kik_str_sep kik_snprintf*/
diff --git a/x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch b/x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch
deleted file mode 100644
index 22b78301379a..000000000000
--- a/x11-terms/mlterm/files/mlterm-3.0.5-ibus.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur mlterm-3.0.5.orig/configure.in mlterm-3.0.5/configure.in
---- mlterm-3.0.5.orig/configure.in 2011-06-04 01:26:40.000000000 +0900
-+++ mlterm-3.0.5/configure.in 2011-06-09 10:45:00.653322007 +0900
-@@ -671,7 +671,8 @@
- if test "x$ibus" = "xyes" ; then
- AC_PROG_CXX
- PKG_CHECK_MODULES(IBUS, ibus-1.0 >= 1.3.0, has_ibus=yes, has_ibus=no)
-- if test "x$has_ibus" = xyes ; then
-+ PKG_CHECK_MODULES(DBUS, dbus-1, has_dbus=yes, has_dbus=no)
-+ if test "x$has_ibus" = xyes -a "x$has_dbus" = xyes ; then
- IM_CFLAGS="$IM_CFLAGS -DUSE_IBUS"
- MAKE_DIRS="inputmethod/ibus ${MAKE_DIRS}"
- OUTPUT_FILES="inputmethod/ibus/Makefile ${OUTPUT_FILES}"
-@@ -683,6 +684,8 @@
- fi
- AC_SUBST(IBUS_CFLAGS)
- AC_SUBST(IBUS_LIBS)
-+AC_SUBST(DBUS_CFLAGS)
-+AC_SUBST(DBUS_LIBS)
-
- #
- # --- SCIM ---
-diff -Naur mlterm-3.0.5.orig/inputmethod/ibus/Makefile.in mlterm-3.0.5/inputmethod/ibus/Makefile.in
---- mlterm-3.0.5.orig/inputmethod/ibus/Makefile.in 2011-06-04 01:26:34.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/ibus/Makefile.in 2011-06-09 10:45:31.063416229 +0900
-@@ -19,11 +19,12 @@
- @CPPFLAGS@ \
- @IM_CFLAGS@ \
- @IBUS_CFLAGS@ \
-+ @DBUS_CFLAGS@ \
- -I$(top_srcdir)/mlterm \
- -I${top_srcdir}/xwindow \
- -I/usr/local/include
-
--LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @IBUS_LIBS@
-+LIBS = $(LIBS_LOCAL) @KIK_LIBS_FOR_MODULE@ @IBUS_LIBS@ @DBUS_LIBS@
-
- CC = @CC@
- INSTALL = @INSTALL@
-diff -Naur mlterm-3.0.5.orig/inputmethod/ibus/im_ibus.c mlterm-3.0.5/inputmethod/ibus/im_ibus.c
---- mlterm-3.0.5.orig/inputmethod/ibus/im_ibus.c 2011-06-04 01:26:34.000000000 +0900
-+++ mlterm-3.0.5/inputmethod/ibus/im_ibus.c 2011-06-09 10:39:58.560385917 +0900
-@@ -4,11 +4,11 @@
-
- #include <stdio.h>
- #include <ibus.h>
-+#include <dbus/dbus.h>
- #include <x_im.h>
- #include <kiklib/kik_list.h>
- #include <kiklib/kik_debug.h>
- #include "../im_info.h"
--
- #if 0
- #define IM_IBUS_DEBUG 1
- #endif
diff --git a/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch b/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch
deleted file mode 100644
index 4e5ed669037e..000000000000
--- a/x11-terms/mlterm/files/mlterm-3.0.7-underlinking.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/xwindow/Makefile.in b/xwindow/Makefile.in
-index 50137e0..1e83104 100644
---- a/xwindow/Makefile.in
-+++ b/xwindow/Makefile.in
-@@ -32,7 +32,7 @@ OBJ = $(OBJ1) $(OBJ2@WIN32TAG@)
-
- LKIK = @LKIK@
- LMKF = @LMKF@
--LMLTERM = ../mlterm/libmlterm.a ../mlterm/@LMLTERM_CORE@
-+LMLTERM = ../mlterm/libmlterm.a ../mlterm/@LMLTERM_CORE@ -lm
- LKIK_DEB = -lkik_deb
- LMKF_DEB = -lmkf_deb
-