diff options
author | nobutaka <nobutaka@FreeBSD.org> | 2003-10-13 23:39:54 +0800 |
---|---|---|
committer | nobutaka <nobutaka@FreeBSD.org> | 2003-10-13 23:39:54 +0800 |
commit | eedb22b1a3a25095cd982c4054c1ae4a8a05cdb3 (patch) | |
tree | 47b919a7939e7854c3d4fb7d059c81e4786b9bf9 /japanese/uim/files | |
parent | 9c4d1eee02a0d5ac9016e2a85aa528f1a5487dfa (diff) | |
download | freebsd-ports-gnome-eedb22b1a3a25095cd982c4054c1ae4a8a05cdb3.tar.gz freebsd-ports-gnome-eedb22b1a3a25095cd982c4054c1ae4a8a05cdb3.tar.zst freebsd-ports-gnome-eedb22b1a3a25095cd982c4054c1ae4a8a05cdb3.zip |
Update to 0.1.1.
Diffstat (limited to 'japanese/uim/files')
-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-helper:helper-applet.c | 23 | ||||
-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, 23 insertions, 76 deletions
diff --git a/japanese/uim/files/patch-configure b/japanese/uim/files/patch-configure deleted file mode 100644 index 2f85193ad77d..000000000000 --- a/japanese/uim/files/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 deleted file mode 100644 index 16c7d22b8175..000000000000 --- a/japanese/uim/files/patch-gtk:gtk-im-uim.c +++ /dev/null @@ -1,16 +0,0 @@ ---- 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-helper:helper-applet.c b/japanese/uim/files/patch-helper:helper-applet.c new file mode 100644 index 000000000000..9a872a80a11a --- /dev/null +++ b/japanese/uim/files/patch-helper:helper-applet.c @@ -0,0 +1,23 @@ +--- helper/helper-applet.c.orig Tue Oct 14 00:07:31 2003 ++++ helper/helper-applet.c Tue Oct 14 00:24:43 2003 +@@ -134,6 +134,7 @@ + gchar **tmp2 = NULL; + gchar *charset = NULL; + GString *path = g_string_new(""); ++ GtkItemFactoryEntry entry; + + tmp2 = g_strsplit(tmp[1], "=", 0); + +@@ -176,7 +177,11 @@ + gtk_widget_show(button); + } else if(strcmp("leaf", tmp2[0]) == 0) { + g_string_printf(path, "/%s", tmp2[2]); +- GtkItemFactoryEntry entry = {path->str, NULL, G_CALLBACK(activate_event), 0, ""}; ++ entry.path = path->str; ++ entry.accelerator = NULL; ++ entry.callback = G_CALLBACK(activate_event); ++ entry.callback_action = 0; ++ entry.item_type = ""; + gtk_item_factory_create_item ( mode_item_fact, &entry, tmp2[4], 1); + + } diff --git a/japanese/uim/files/patch-uim:uim-func.c b/japanese/uim/files/patch-uim:uim-func.c deleted file mode 100644 index b5ed135e0e36..000000000000 --- a/japanese/uim/files/patch-uim:uim-func.c +++ /dev/null @@ -1,25 +0,0 @@ ---- 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 deleted file mode 100644 index 3206900a9e0b..000000000000 --- a/japanese/uim/files/patch-xim:Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 |