> Thank you very much for porting UIM!
>
> Now all I want is UIM-enabled mlterm in tree.
> (I'm using mlterm-2.9.4pre [CVS HEAD].
> The latest release is 2.9.3. Both are very stable.)
I am curious to know if there is anything else you need to do to use it
from within mlterm. Here's an mlterm update to 2.9.3 with uim support.
Not sure if I should bump SHARED_LIBS or not. If someone could comment
that would be cool.
Index: Makefile
===
RCS file: /cvs/ports/x11/mlterm/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile16 Dec 2006 12:22:36 - 1.15
+++ Makefile9 Jan 2007 03:34:48 -
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.15 2006/12/16 12:22:36 espie Exp $
COMMENT= "color terminal emulator with transparency and unicode support"
-DISTNAME= mlterm-2.9.0
-PKGNAME= ${DISTNAME}p5
+DISTNAME= mlterm-2.9.3
SHARED_LIBS= kik 10.0 \
mkf 13.0
CATEGORIES=x11
@@ -25,14 +24,16 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
USE_X11= Yes
SHARED_ONLY=Yes
-LIB_DEPENDS= gdk_pixbuf-2.0.>=0.14,gtk-x11-2.0.>=0.14::x11/gtk+2
+LIB_DEPENDS= gdk_pixbuf-2.0.>=0.14,gtk-x11-2.0.>=0.14::x11/gtk+2 \
+ uim::inputmethods/uim
MODULES= devel/gettext
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--enable-anti-alias --enable-utmp \
- --with-imagelib=gdk-pixbuf2 --with-type-engines=xft,xcore
+CONFIGURE_ARGS=--enable-anti-alias --enable-utmp --enable-uim \
+ --with-imagelib=gdk-pixbuf2 --with-type-engines=xft,xcore \
+ --enable-uim
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/freetype2" \
PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
MAKE_ENV= LIBkik_VERSION=${LIBkik_VERSION} \
Index: distinfo
===
RCS file: /cvs/ports/x11/mlterm/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo5 Jan 2005 17:54:05 - 1.3
+++ distinfo9 Jan 2007 03:34:48 -
@@ -1,4 +1,4 @@
-MD5 (mlterm-2.9.0.tar.gz) = fb0c077b4ac1a2cf7ca455dc79b6cf6a
-RMD160 (mlterm-2.9.0.tar.gz) = 24b1c06a857a0309d1eaddbed60b2bbcf5ea1e90
-SHA1 (mlterm-2.9.0.tar.gz) = cbc72b653a96111fecb00344b0f48b70978d8010
-SIZE (mlterm-2.9.0.tar.gz) = 1884906
+MD5 (mlterm-2.9.3.tar.gz) = 20188c0981a49dbb95c3ff5b8eb25365
+RMD160 (mlterm-2.9.3.tar.gz) = 27f4381a8b8b68b07e53bbeb422581beb7527b48
+SHA1 (mlterm-2.9.3.tar.gz) = 65ba5a7bd83accf7f621f84b84debb35c8f215ef
+SIZE (mlterm-2.9.3.tar.gz) = 1984977
Index: patches/patch-xwindow_x_imagelib_gdk_c
===
RCS file: patches/patch-xwindow_x_imagelib_gdk_c
diff -N patches/patch-xwindow_x_imagelib_gdk_c
--- patches/patch-xwindow_x_imagelib_gdk_c 11 Mar 2005 21:30:14 -
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,55 +0,0 @@
-$OpenBSD: patch-xwindow_x_imagelib_gdk_c,v 1.1 2005/03/11 21:30:14 robert Exp $
xwindow/x_imagelib_gdk.c.orig Fri Mar 11 21:52:55 2005
-+++ xwindow/x_imagelib_gdk.c Fri Mar 11 21:57:26 2005
-@@ -294,6 +294,12 @@
- unsigned char *pixel ;
- int i, j ;
-
-+ if( !width || !height)
-+ return -1;
-+
-+ if( width > ((SIZE_MAX / 4) - 2) / height)
-+ return -1; /* integer overflow */
-+
- *cardinal = malloc( (width * height + 2) *4) ;
- if( !(*cardinal))
- return -1 ;
-@@ -356,7 +362,7 @@
- int blue
- )
- {
-- int closest ;
-+ int closest = 0 ;
- int i ;
- unsigned long min = 0xff ;
- unsigned long diff ;
-@@ -831,6 +837,9 @@
-
- width = gdk_pixbuf_get_width( pixbuf) ;
- height = gdk_pixbuf_get_height( pixbuf) ;
-+
-+ if( !width || !height)
-+ return NULL ;
-
- r_mask = vinfo[0].red_mask ;
- g_mask = vinfo[0].green_mask ;
-@@ -851,6 +860,9 @@
- int r_limit, g_limit, b_limit ;
- u_int16_t *data ;
-
-+ if( width > (SIZE_MAX / 2) / height)
-+ return NULL ;
-+
- data = (u_int16_t *)malloc( width * height * 2) ;
- if( !data)
- return NULL ;
-@@ -883,6 +895,9 @@
- {
- u_int32_t * data ;
-
-+ if( width > (SIZE_MAX / 4) / height)
-+ return NULL;
-+
- data = (u_int32_t *)malloc( width * height * 4) ;
- if( !data)
- return NULL;
Index: pkg/PFRAG.shared
===
RCS file: /cvs/ports/x11/mlterm/pkg/PFRAG.shared,v
retrieving revision 1.4
diff -u -p -r1.4 PFRAG.shared
--- pkg/PFRAG.shared25 Dec 2005 21:14:27 - 1.4
+++ pkg/PFRAG.shared9 Jan 2007 03:34:4
