diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2005-06-26 19:42:42 +0000 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2005-06-26 19:42:42 +0000 |
| commit | ef48641145fc2606ccae4cf73f96a33bc99d29a5 (patch) | |
| tree | ee764985d3f43c618a44b333b28522c2ff71d3c6 /textproc/uim/files | |
| parent | Update to 4.22. See http://www.jwz.org/xscreensaver/changelog.html for a (diff) | |
Update to 0.4.7.
Notes
Notes:
svn path=/head/; revision=138048
Diffstat (limited to 'textproc/uim/files')
| -rw-r--r-- | textproc/uim/files/patch-scm:skk-custom.scm | 12 | ||||
| -rw-r--r-- | textproc/uim/files/patch-uim:context.h | 22 |
2 files changed, 6 insertions, 28 deletions
diff --git a/textproc/uim/files/patch-scm:skk-custom.scm b/textproc/uim/files/patch-scm:skk-custom.scm index 6de03484da18..895f1ad6738a 100644 --- a/textproc/uim/files/patch-scm:skk-custom.scm +++ b/textproc/uim/files/patch-scm:skk-custom.scm @@ -1,12 +1,12 @@ ---- scm/skk-custom.scm.orig Tue May 17 19:06:47 2005 -+++ scm/skk-custom.scm Tue May 17 19:13:48 2005 -@@ -168,8 +168,7 @@ - ;; dictionary - ;; +--- scm/skk-custom.scm.orig Tue Jun 14 05:46:11 2005 ++++ scm/skk-custom.scm Mon Jun 27 02:29:34 2005 +@@ -338,8 +338,7 @@ + (lambda () + skk-use-skkserv?)) -(define-custom 'skk-dic-file-name (string-append (sys-datadir) - "/skk/SKK-JISYO.L") +(define-custom 'skk-dic-file-name "%%LOCALBASE%%/share/skk/SKK-JISYO.L" - '(skk dictionary) + '(skk-dict) '(pathname) (_ "Dictionary file") diff --git a/textproc/uim/files/patch-uim:context.h b/textproc/uim/files/patch-uim:context.h deleted file mode 100644 index fc4da7781f4c..000000000000 --- a/textproc/uim/files/patch-uim:context.h +++ /dev/null @@ -1,22 +0,0 @@ ---- uim/context.h.orig Sat Feb 5 11:50:05 2005 -+++ uim/context.h Sun Jun 5 16:43:06 2005 -@@ -156,13 +156,16 @@ - - #ifdef ENABLE_NLS - #define UIM_PREPARE_SAVING_TEXTDOMAIN_CODESET() \ -- const char *orig_encoding, *client_encoding; -+ char *enc, *orig_encoding = NULL; \ -+ const char *client_encoding; - #define UIM_SWITCH_TEXTDOMAIN_CODESET(uc) \ -- orig_encoding = bind_textdomain_codeset(GETTEXT_PACKAGE, NULL); \ -+ if ((enc = bind_textdomain_codeset(GETTEXT_PACKAGE, NULL))) \ -+ orig_encoding = strdup(enc); \ - client_encoding = (uc) ? ((struct uim_context_ *)uc)->encoding : uim_last_client_encoding; \ - bind_textdomain_codeset(GETTEXT_PACKAGE, client_encoding); - #define UIM_RESTORE_TEXTDOMAIN_CODESET() \ -- bind_textdomain_codeset(GETTEXT_PACKAGE, orig_encoding); -+ bind_textdomain_codeset(GETTEXT_PACKAGE, orig_encoding); \ -+ free(orig_encoding); - #else /* ENABLE_NLS */ - #define UIM_PREPARE_SAVING_TEXTDOMAIN_CODESET() - #define UIM_SWITCH_TEXTDOMAIN_CODESET(uc) |