diff options
author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2003-08-31 12:24:07 +0000 |
---|---|---|
committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2003-08-31 12:24:07 +0000 |
commit | cdf7bf03b42360dd043c4ffb23be01e5719bdfcd (patch) | |
tree | ee5cc662f357bf1554ac7b1094a3ed9cc9fae74b /japanese/uim/files | |
parent | perl -> reinplace (diff) |
Add uim, an input method library.
Notes
Notes:
svn path=/head/; revision=88191
Diffstat (limited to 'japanese/uim/files')
-rw-r--r-- | japanese/uim/files/patch-Makefile.in | 13 | ||||
-rw-r--r-- | japanese/uim/files/patch-configure | 24 | ||||
-rw-r--r-- | japanese/uim/files/patch-gtk:gtk-im-uim.c | 16 | ||||
-rw-r--r-- | japanese/uim/files/patch-uim:uim-func.c | 25 | ||||
-rw-r--r-- | japanese/uim/files/patch-xim:Makefile.in | 11 |
5 files changed, 89 insertions, 0 deletions
diff --git a/japanese/uim/files/patch-Makefile.in b/japanese/uim/files/patch-Makefile.in new file mode 100644 index 000000000000..6f8115846be4 --- /dev/null +++ b/japanese/uim/files/patch-Makefile.in @@ -0,0 +1,13 @@ +--- Makefile.in.orig Sat Aug 30 09:37:54 2003 ++++ Makefile.in Sun Aug 31 15:38:52 2003 +@@ -131,7 +131,9 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ + AUTOMAKE_OPTIONS = foreign +-SUBDIRS = m4 doc scm uim xim helper po gtk ++SUBDIRS = m4 doc scm uim xim po ++@GTK2_TRUE@SUBDIRS := $(SUBDIRS) gtk ++@GNOME2_TRUE@SUBDIRS := $(SUBDIRS) helper + EXTRA_DIST = README.ja INSTALL.ja test.sh.in uim.spec.in \ + intltool-extract.in intltool-merge.in intltool-update.in + diff --git a/japanese/uim/files/patch-configure b/japanese/uim/files/patch-configure new file mode 100644 index 000000000000..2f85193ad77d --- /dev/null +++ b/japanese/uim/files/patch-configure @@ -0,0 +1,24 @@ +--- configure.orig Mon Aug 25 23:34:01 2003 ++++ configure Mon Aug 25 23:34:40 2003 +@@ -21430,10 +21430,6 @@ + + if test $succeeded = yes; then + use_gtk2="yes" +- else +- { { echo "$as_me:$LINENO: error: Library requirements (gtk+-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +-echo "$as_me: error: Library requirements (gtk+-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} +- { (exit 1); exit 1; }; } + fi + + +@@ -21528,10 +21524,6 @@ + + if test $succeeded = yes; then + use_gnome2="yes" +- else +- { { echo "$as_me:$LINENO: error: Library requirements (libgnome-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +-echo "$as_me: error: Library requirements (libgnome-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} +- { (exit 1); exit 1; }; } + fi + + diff --git a/japanese/uim/files/patch-gtk:gtk-im-uim.c b/japanese/uim/files/patch-gtk:gtk-im-uim.c new file mode 100644 index 000000000000..16c7d22b8175 --- /dev/null +++ b/japanese/uim/files/patch-gtk:gtk-im-uim.c @@ -0,0 +1,16 @@ +--- gtk/gtk-im-uim.c.orig Sun Aug 31 15:40:29 2003 ++++ gtk/gtk-im-uim.c Sun Aug 31 15:41:10 2003 +@@ -109,10 +109,12 @@ + static void + pushback_cb(void *ptr, int attr, char *str) + { ++ IMUIMContext *uic; ++ + if(!str) + return; + +- IMUIMContext *uic = ptr; ++ uic = ptr; + uic->pseg = realloc(uic->pseg, + sizeof(struct preedit_segment) * + (uic->nr_psegs + 1)); diff --git a/japanese/uim/files/patch-uim:uim-func.c b/japanese/uim/files/patch-uim:uim-func.c new file mode 100644 index 000000000000..b5ed135e0e36 --- /dev/null +++ b/japanese/uim/files/patch-uim:uim-func.c @@ -0,0 +1,25 @@ +--- uim/uim-func.c.orig Sun Aug 31 15:09:52 2003 ++++ uim/uim-func.c Sun Aug 31 15:10:19 2003 +@@ -97,15 +97,17 @@ + char * + uim_code_conv(char *str, iconv_t ic) + { ++ int len, buflen; ++ char *realbuf, *outbuf, *inbuf; + + if(!str) + return NULL; + +- int len = strlen(str); +- int buflen = len * 6+3; +- char *realbuf = alloca(buflen); +- char *outbuf = realbuf; +- char *inbuf = str; ++ len = strlen(str); ++ buflen = len * 6+3; ++ realbuf = alloca(buflen); ++ outbuf = realbuf; ++ inbuf = str; + if (!ic) { + return strdup(str); + } diff --git a/japanese/uim/files/patch-xim:Makefile.in b/japanese/uim/files/patch-xim:Makefile.in new file mode 100644 index 000000000000..3206900a9e0b --- /dev/null +++ b/japanese/uim/files/patch-xim:Makefile.in @@ -0,0 +1,11 @@ +--- xim/Makefile.in.orig Mon Aug 25 23:44:36 2003 ++++ xim/Makefile.in Mon Aug 25 23:45:03 2003 +@@ -139,7 +139,7 @@ + install_sh = @install_sh@ + + INCLUDES = -I$(top_srcdir) +-CPPFLAGS = -DLOCALEDIR=\""$(localedir)"\" ++CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\""$(localedir)"\" + + bin_PROGRAMS = uim-xim + uim_xim_LDFLAGS = -L/usr/lib -L/usr/X11R6/lib |