commit 86aa1df95965201674009f1ffd3778aee42dc27e21a5aa469cc562ed31a58c57 Author: OBS User unknown Date: Wed Dec 27 11:51:08 2006 +0000 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/uim?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/etc-x11-xim.d-uim b/etc-x11-xim.d-uim new file mode 100644 index 0000000..6d5559b --- /dev/null +++ b/etc-x11-xim.d-uim @@ -0,0 +1,23 @@ +OLD_PATH=$PATH +PATH=/usr/bin:/usr/X11R6/bin:$PATH + +if ! type -p uim-xim > /dev/null 2>&1 ; then + echo "uim-xim is not available." + return 1 +fi +if rpm -q uim-qt > /dev/null 2>&1 ; then + echo "uim-qt package is not installed." + return 1 +fi + +export XMODIFIERS="@im=uim" +export GTK_IM_MODULE=uim +export QT_IM_SWITCHER=imsw-multi +export QT_IM_MODULE=uim + +uim-xim & + +PATH=$OLD_PATH + +# success: +return 0 diff --git a/qt-build.patch b/qt-build.patch new file mode 100644 index 0000000..86b519d --- /dev/null +++ b/qt-build.patch @@ -0,0 +1,15 @@ +diff -ru uim-1.2.1.orig/configure.ac uim-1.2.1/configure.ac +--- uim-1.2.1.orig/configure.ac 2006-08-14 06:27:37.000000000 +0200 ++++ uim-1.2.1/configure.ac 2006-09-14 12:46:00.000000000 +0200 +@@ -709,7 +709,10 @@ + fi + + # GUESS $QTLIBDIR +- QTLIBDIR="$QTDIR/lib" ++ QTLIBDIR="$QTDIR/lib64" ++ if test ! -d "$QTLIBDIR"; then ++ QTLIBDIR="$QTDIR/lib" ++ fi + if test ! -d "$QTLIBDIR"; then + QTLIBDIR="/usr/lib/qt3" + fi diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/suse-start-uim.el b/suse-start-uim.el new file mode 100644 index 0000000..a36f758 --- /dev/null +++ b/suse-start-uim.el @@ -0,0 +1,13 @@ +;; /usr/share/emacs/site-lisp/suse-start-uim.el + +(add-to-list 'load-path "/usr/share/emacs/site-lisp/uim-el") + +;; candidate display style of this buffer +(defvar uim-candidate-display-inline t + "If non-nil, a candidate list is displayed below the +preedit string in vertical direction. Otherwise, it is +displayed at the echo area.") + +(load "/usr/share/emacs/site-lisp/uim-el/uim-leim" nil t) + +;; /usr/share/emacs/site-lisp/suse-start-uim-el.el ends here diff --git a/uim-1.2.1.tar.bz2 b/uim-1.2.1.tar.bz2 new file mode 100644 index 0000000..0ff8a21 --- /dev/null +++ b/uim-1.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73cc3e01990f2a3110ea00eed5d5b1f26082f3d02cbb46b23573ca7d1fddc932 +size 1669647 diff --git a/uim-aliasing.patch b/uim-aliasing.patch new file mode 100644 index 0000000..fb743b7 --- /dev/null +++ b/uim-aliasing.patch @@ -0,0 +1,73 @@ +--- uim/anthy.c ++++ uim/anthy.c +@@ -93,16 +93,16 @@ + dlclose(api.diclib); + return -1; + } +- *(int **)(&api.init) = dlsym(api.lib, "anthy_init"); +- *(int **)(&api.quit) = dlsym(api.lib, "anthy_quit"); +- *(struct anthy_context **)(&api.create_context) = dlsym(api.lib, "anthy_create_context"); +- *(void **)(&api.release_context) = dlsym(api.lib, "anthy_release_context"); +- *(void **)(&api.set_string) = dlsym(api.lib, "anthy_set_string"); +- *(void **)(&api.get_stat) = dlsym(api.lib, "anthy_get_stat"); +- *(void **)(&api.get_segment_stat) = dlsym(api.lib, "anthy_get_segment_stat"); +- *(int **)(&api.get_segment) = dlsym(api.lib, "anthy_get_segment"); +- *(void **)(&api.resize_segment) = dlsym(api.lib, "anthy_resize_segment"); +- *(void **)(&api.commit_segment) = dlsym(api.lib, "anthy_commit_segment"); ++ api.init = (int (*)(void))dlsym(api.lib, "anthy_init"); ++ api.quit = (int (*)(void))dlsym(api.lib, "anthy_quit"); ++ api.create_context = (struct anthy_context *(*)(void))dlsym(api.lib, "anthy_create_context"); ++ api.release_context = (void (*)(struct anthy_context *))dlsym(api.lib, "anthy_release_context"); ++ api.set_string = (void (*)(struct anthy_context *, char *))dlsym(api.lib, "anthy_set_string"); ++ api.get_stat = (void (*)(struct anthy_context *, struct anthy_conv_stat *))dlsym(api.lib, "anthy_get_stat"); ++ api.get_segment_stat = (void (*)(struct anthy_context *, int, struct anthy_segment_stat *))dlsym(api.lib, "anthy_get_segment_stat"); ++ api.get_segment = (int (*)(struct anthy_context *, int, int, char *, int))dlsym(api.lib, "anthy_get_segment"); ++ api.resize_segment = (void (*)(struct anthy_context *, int, int))dlsym(api.lib, "anthy_resize_segment"); ++ api.commit_segment = (void (*)(struct anthy_context *, int, int))dlsym(api.lib, "anthy_commit_segment"); + if (api.init && + api.quit && + api.create_context && +--- xim/connection.cpp ++++ xim/connection.cpp +@@ -216,13 +216,13 @@ + int format; + unsigned long nrItems; + unsigned long remain; +- char *data; ++ unsigned char *data; + do { + XGetWindowProperty(XimServer::gDpy, ev->window, ev->data.l[1], + offset, BUF_SIZE - mBuf.len, True, + AnyPropertyType, + &type, &format, &nrItems, &remain, +- (unsigned char **)&data); ++ &data); + if (!data) + return false; + +--- xim/ximserver.cpp ++++ xim/ximserver.cpp +@@ -191,20 +191,20 @@ + Atom type; + int format; + unsigned long nr_prop, nr_bytes; +- Atom *prop; ++ unsigned char *prop; + int mode = PropModePrepend; + int valuechange = 1; + + XGetWindowProperty(XimServer::gDpy, DefaultRootWindow(XimServer::gDpy), + xim_servers, 0, 8192 ,False, + XA_ATOM, &type, &format, +- &nr_prop, &nr_bytes, (unsigned char **)&prop); ++ &nr_prop, &nr_bytes, &prop); + int i; + if (type != XA_ATOM || format != 32) + mode = PropModeReplace; + else { + for (i = 0; i < (int)nr_prop; i++) { +- if (prop[i] == mServerAtom) { ++ if (((Atom *)prop)[i] == mServerAtom) { + mode = PropModeAppend; + valuechange = 0; + break; diff --git a/uim-configure.patch b/uim-configure.patch new file mode 100644 index 0000000..3347cc6 --- /dev/null +++ b/uim-configure.patch @@ -0,0 +1,26 @@ +--- configure.ac ++++ configure.ac +@@ -7,10 +7,6 @@ + + AM_CONFIG_HEADER([uim/config.h]) + +-# Set empty values to cancel default "-g -O2" +-CFLAGS="" +-CXXFLAGS="" +- + # Checks for programs. + AC_PROG_CXX + AC_PROG_CC +@@ -238,10 +234,10 @@ + + LIBDIR=`eval echo ${libdir}` + AC_DEFINE_UNQUOTED(LIBDIR, "$LIBDIR", [libraries dir]) +-DATADIR=`eval echo ${datadir}` ++eval eval DATADIR=${datadir} + AC_DEFINE_UNQUOTED(DATADIR, "$DATADIR", [read-only architecture-independent data dir]) + # we should use more safe macro such as AC_EXPAND_DIR +-LOCALEDIR=`eval echo ${datadir}/locale` ++eval eval LOCALEDIR=${datadir}/locale + # backward compatibility + localedir=$LOCALEDIR + AC_DEFINE_UNQUOTED(LOCALEDIR, "$LOCALEDIR", [locale dir]) diff --git a/uim-el.patch b/uim-el.patch new file mode 100644 index 0000000..b3c5d9c --- /dev/null +++ b/uim-el.patch @@ -0,0 +1,137 @@ +--- emacs/uim-candidate.el ++++ emacs/uim-candidate.el +@@ -317,7 +317,7 @@ + (setq cands + (concat (if (> page-space 0) (make-string page-space 32)) + page-current "/" page-total " " cands)) +- (message cands) ++ (message "%s" cands) + ) + ;; Emacs-20 or XEmacs + (let* ((page-space (- (string-width page-total) +@@ -378,7 +378,7 @@ + ?.)))))) + + (let (message-log-max) +- (message cands)) ++ (message "%s" cands)) + ) + + ) +--- emacs/uim-helper.el ++++ emacs/uim-helper.el +@@ -100,7 +100,8 @@ + (save-current-buffer + (set-buffer buffer) (erase-buffer)) + +- (message "uim.el: starting uim-el-helper-agent...") ++ (unless noninteractive ++ (message "uim.el: starting uim-el-helper-agent...")) + + (setq proc (start-process "uim-el-helper-agent" + buffer uim-el-helper-agent)) +@@ -134,7 +135,8 @@ + + (set-process-sentinel proc 'uim-helper-process-sentinel) + +- (message "uim.el: starting uim-el-helper-agent... done") ++ (unless noninteractive ++ (message "uim.el: starting uim-el-helper-agent... done")) + + proc + )) +--- emacs/uim-leim.el ++++ emacs/uim-leim.el +@@ -51,11 +51,6 @@ + (setq uim-leim-active nil) + (uim-mode-off)) + +-(defadvice toggle-input-method (around uim-toggle-input-method-around activate) +- (if buffer-read-only +- (not (message "uim.el: This buffer is read-only.")) +- ad-do-it)) +- + ;; Activate function (callback?) + ;; all uim related LEIM input methods call this function at activation time + (defun uim-leim-activate (&optional name) +@@ -109,8 +104,6 @@ + ) + + (defun uim-leim-input-method-activate-hook () +- (setq current-input-method-title uim-leim-mode-line-string) +- + (if uim-xemacs + (uim-leim-xemacs-modeline-init)) + ) +--- emacs/uim.el ++++ emacs/uim.el +@@ -95,7 +95,7 @@ + (defun uim-check-im (im) + (if (assoc im uim-im-alist) + t +- (message (format "uim.el: invalid IM engine: %s" im)))) ++ (message "uim.el: invalid IM engine: %s" im))) + + ;; + ;; Get default IM engine name. +@@ -477,7 +477,8 @@ + (save-current-buffer + (set-buffer buffer) (erase-buffer)) + +- (message "uim.el: starting uim-el-agent...") ++ (unless noninteractive ++ (message "uim.el: starting uim-el-agent...")) + + (setq proc (start-process "uim-el-agent" buffer uim-el-agent)) + +@@ -508,7 +509,8 @@ + + (set-process-sentinel proc 'uim-process-sentinel) + +- (message "uim.el: starting uim-el-agent... done") ++ (unless noninteractive ++ (message "uim.el: starting uim-el-agent... done")) + + proc + )) +@@ -952,7 +954,7 @@ + (progn + (if uim-show-keystrokes + (let (message-log-max) +- (message (key-description keyvec)))) ++ (message "%s" (key-description keyvec)))) + + (setq uim-last-key-vector keyvec) + +@@ -1057,7 +1059,7 @@ + (key-description (vector x)) + " "))) + (append uim-last-key-vector nil)) +- (message keymsg)) ++ (message "%s" keymsg)) + ) + ))) + +@@ -1081,9 +1083,10 @@ + ;; display "ESC-" or something + (if uim-show-keystrokes + (let (message-log-max) +- (message (concat (key-description (vconcat uim-prefix-arg-vector +- uim-stacked-key-vector)) +- "-")))) ++ (message "%s" (concat (key-description ++ (vconcat uim-prefix-arg-vector ++ uim-stacked-key-vector)) ++ "-")))) + )) + + (if uim-emacs +@@ -1512,7 +1515,7 @@ + ;; + (defun uim-el-version () + (interactive) +- (message uim-el-version)) ++ (message "%s" uim-el-version)) + + + diff --git a/uim-slib.patch b/uim-slib.patch new file mode 100644 index 0000000..f868fc7 --- /dev/null +++ b/uim-slib.patch @@ -0,0 +1,17 @@ +--- uim/slib.c ++++ uim/slib.c +@@ -2924,6 +2924,14 @@ + mark_protected_registers (); + mark_locations ((LISP *) stack_start_ptr, + (LISP *) & stack_end); ++#ifdef __ia64__ ++ { ++ extern void *__libc_ia64_register_backing_store_base; ++ __builtin_ia64_flushrs (); ++ mark_locations ((LISP *) __libc_ia64_register_backing_store_base, ++ (LISP *) __builtin_ia64_bsp ()); ++ } ++#endif + gc_sweep (); + gc_ms_stats_end (); + } diff --git a/uim.changes b/uim.changes new file mode 100644 index 0000000..6ad10fa --- /dev/null +++ b/uim.changes @@ -0,0 +1,196 @@ +------------------------------------------------------------------- +Mon Dec 25 19:04:31 CET 2006 - schwab@suse.de + +- Fix format string bugs. +- Make uim-el less chatty. +- Remove inappropriate advice. +- Don't clobber current-input-method-title. + +------------------------------------------------------------------- +Fri Sep 15 16:39:43 CEST 2006 - mfabian@suse.de + +- make auto-autoloads.el for XEmacs really work. +- make vertical candidate list display the default. + +------------------------------------------------------------------- +Thu Sep 14 13:41:49 CEST 2006 - mfabian@suse.de + +- add uim-el for XEmacs. +- byte-compile the .el files for Emacs and XEmacs. +- add suse-start-uim.el for Emacs and auto-autoloads.el for XEmacs + to be able to use uim-el without further setup. + +------------------------------------------------------------------- +Mon Sep 11 12:57:06 CEST 2006 - mfabian@suse.de + +- update to 1.2.1. +- new subpackage uim-qt (used to be build from a different + tarball but it is now included in uim). + +------------------------------------------------------------------- +Mon Jun 19 10:34:29 CEST 2006 - schwab@suse.de + +- Work around broken use of configure substitutions. + +------------------------------------------------------------------- +Tue Feb 28 18:27:20 CET 2006 - mfabian@suse.de + +- add "Provides: locale(...)". + +------------------------------------------------------------------- +Wed Jan 25 21:42:24 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Jan 18 17:10:14 CET 2006 - schwab@suse.de + +- Fix garbage collector. +- Use RPM_OPT_FLAGS. +- Fix aliasing bugs. + +------------------------------------------------------------------- +Fri Aug 26 11:22:24 CEST 2005 - mfabian@suse.de + +- Bugzilla #113081: uim should register the input modules in the + %post script. + +------------------------------------------------------------------- +Thu Aug 25 12:34:11 CEST 2005 - mfabian@suse.de + +- Bugzilla #112931: gtk2 specific stuff in %post and %postun should + be moved to the proper sub-package. + +------------------------------------------------------------------- +Mon Aug 08 14:13:52 CEST 2005 - mfabian@suse.de + +- update to 0.4.8. + +------------------------------------------------------------------- +Tue May 31 16:42:01 CEST 2005 - mfabian@suse.de + +- update to 0.4.6 svn revison 850. + remove ipa-x-sampa.patch (included). + +------------------------------------------------------------------- +Mon Apr 25 12:57:13 CEST 2005 - mfabian@suse.de + +- update to 0.4.6 svn revision 828. +- fix a small problem in ipa-x-sampa: mnenonic for U+02D0 and + U+02D1 is ':' and ':\' respectively (not ';' and ';\'). + +------------------------------------------------------------------- +Thu Feb 24 17:39:48 CET 2005 - mfabian@suse.de + +- Bugzilla #66448: update to 0.4.6 svn revision 714 + to fix a security problem (CAN-2005-0503). + +------------------------------------------------------------------- +Tue Feb 22 16:26:29 CET 2005 - mfabian@suse.de + +- fix typo in /etc/X11/xim.d/uim. + +------------------------------------------------------------------- +Tue Feb 22 15:30:36 CET 2005 - mfabian@suse.de + +- create start script /etc/X11/xim.d/uim and symlink in ja + subdirectory. + +------------------------------------------------------------------- +Sat Jan 08 10:40:59 CET 2005 - mfabian@suse.de + +- update to 0.4.5.20050108.165 (fixes crashes and moves the plugins + to the correct directory). +- add anthy, anthy-devel to "# neededforbuild". Previously anthy + was not needed at buildtime but now it is. +- remove dont-use-uim-default-by-default-for-all-languages.patch, + it's not necessary anymore and setting the wildcard for the + direct input method to the empty string instead of "*" makes + uim crash. + +------------------------------------------------------------------- +Fri Jan 07 15:31:02 CET 2005 - mfabian@suse.de + +- update to 0.4.5.20050107. +- remove uim-toolbar-gtk.patch (now included in tarball). + +------------------------------------------------------------------- +Wed Jan 05 00:04:46 CET 2005 - mfabian@suse.de + +- update prime.scm to prime_2004-12-13.scm. + +------------------------------------------------------------------- +Wed Dec 22 11:59:13 CET 2004 - mfabian@suse.de + +- apply uim-toolbar-gtk.patch received from + TOKUNAGA Hiroyuki to make uim-toolbar-gtk work + with gtk+ >= 2.5. + +------------------------------------------------------------------- +Fri Dec 17 15:43:14 CET 2004 - mfabian@suse.de + +- fix version number in configure.ac. + +------------------------------------------------------------------- +Wed Dec 15 15:18:29 CET 2004 - mfabian@suse.de + +- update to 0.4.5svn1650. + dont-use-uim-default-by-default-for-all-languages.patch is + apparently not necessary anymore. + +------------------------------------------------------------------- +Fri Sep 17 01:51:45 CEST 2004 - ro@suse.de + +- remove xfce from neededforbuild (unused anyway) + +------------------------------------------------------------------- +Sat Sep 4 21:30:13 CEST 2004 - mfabian@suse.de + +- update to 0.4.3. + +------------------------------------------------------------------- +Tue Aug 24 20:32:10 CEST 2004 - mfabian@suse.de + +- Bugzilla #44155: add /usr/bin/touch to PreReq:. + +------------------------------------------------------------------- +Fri Aug 20 18:16:04 CEST 2004 - mfabian@suse.de + +- update to svn trunk (0.4.2.1.20040820) to fix the switching + between the romaji and kana input mode, see also: + http://freedesktop.org/pipermail/uim/2004-August/000603.html + +------------------------------------------------------------------- +Fri Aug 13 22:50:11 CEST 2004 - mfabian@suse.de + +- update to 0.4.2.1 +- add control-reaches-end-of-non-void-function.patch. +- move uim-helper-candwin-gtk, uim-helper-toolbar-gtk, and + uim-helper-applet to uim-applet sub-package. + +------------------------------------------------------------------- +Tue Mar 16 23:31:04 CET 2004 - mfabian@suse.de + +- update to 0.3.2. + +------------------------------------------------------------------- +Tue Mar 16 23:15:42 CET 2004 - mfabian@suse.de + +- make only uim-anthy a default gtk-input-module for Japanese. +- don't use the uim-default input module for any language by + default (This module was used for *all* languages by default, + that means even when running in de_DE.UTF-8 locale, + uim-helper-server would start, which is quite useless). +- add canna canna-devel canna-libs to # neededforbuild in order + to build the uim-canna module as well. + +------------------------------------------------------------------- +Fri Mar 5 14:49:48 CET 2004 - mfabian@suse.de + +- update to 0.3.1 +- remove uim.patch and warnings.patch (included upstream). + +------------------------------------------------------------------- +Thu Feb 26 12:39:24 CET 2004 - mfabian@suse.de + +- new package, version 0.3.0.1. diff --git a/uim.desktop.patch b/uim.desktop.patch new file mode 100644 index 0000000..a86af82 --- /dev/null +++ b/uim.desktop.patch @@ -0,0 +1,12 @@ +diff -ru uim-0.4.6.20050224.714.orig/uim.desktop uim-0.4.6.20050224.714/uim.desktop +--- uim-0.4.6.20050224.714.orig/uim.desktop 2005-02-05 05:02:02.000000000 +0100 ++++ uim-0.4.6.20050224.714/uim.desktop 2005-02-24 15:37:41.000000000 +0100 +@@ -6,7 +6,6 @@ + Comment= + Comment[ja]= + Exec=uim-pref-gtk +-Icon=uim.png + Terminal=false + MimeType=text/plain + Categories=Settings + diff --git a/uim.spec b/uim.spec new file mode 100644 index 0000000..4f2d342 --- /dev/null +++ b/uim.spec @@ -0,0 +1,405 @@ +# +# spec file for package uim (Version 1.2.1) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: uim +BuildRequires: anthy-devel canna-devel emacs-x11 gcc-c++ gnome-panel-devel gnutls-devel intltool libgnomeprintui-devel libwnck-devel mDNSResponder-devel perl-XML-Parser pkgconfig qt3-devel update-desktop-files xemacs +License: GNU General Public License (GPL) +Group: System/I18n/Japanese +Autoreqprov: on +PreReq: /usr/bin/touch +Provides: locale(xorg-x11:ja) +Version: 1.2.1 +Release: 37 +URL: http://uim.freedesktop.org/wiki/ +# svn co http://freedesktop.org:8080/svn/uim/trunk +# Source0: http://freedesktop.org/Software/UimDownload/uim-0.4.2.1.tar.bz2 +# freedesktop svn archive is broken. Currently there is an snapshot of +# a new svn repository available which is updated every hour: +# http://freedesktop.org/~tkng/uim-trunk.tar.gz +Source0: http://uim.freedesktop.org/releases/uim-1.2.1.tar.bz2 +Source1: suse-start-uim.el +Source2: xemacs-auto-autoloads.el +Source3: etc-x11-xim.d-uim +Patch0: uim.desktop.patch +Patch1: qt-build.patch +Patch3: version.patch +Patch4: uim-configure.patch +Patch5: uim-slib.patch +Patch6: uim-aliasing.patch +Patch7: uim-el.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Summary: a multilingual input method library + +%description +Uim is a multilingual input method library. Uim's project goal is to +provide secure and useful input method for all languages. Currently, it +can input to applications which support gtk+'s immodule or XIM. + + + +Authors: +-------- + TOKUNAGA Hiroyuki + Masahito Omote + Yusuke Tabata + Yamaken + NOKUBI Takatsugu + +%package devel +Summary: Include Files and Libraries mandatory for Development. +Group: System/I18n/Japanese +Requires: %{name} = %{version} + +%description devel +Include Files and Libraries mandatory for Development. + + + +Authors: +-------- + TOKUNAGA Hiroyuki + Masahito Omote + Yusuke Tabata + Yamaken + NOKUBI Takatsugu + +%package gtk2 +Summary: Control applet using gnome2 +Group: System/I18n/Japanese +Requires: %{name} = %{version} +Obsoletes: uim-applet +Provides: uim-applet +Provides: locale(gnome-libs:ja) + +%description gtk2 +Control applet using gnome2 + + + +Authors: +-------- + TOKUNAGA Hiroyuki + Masahito Omote + Yusuke Tabata + Yamaken + NOKUBI Takatsugu + +%package qt +Summary: Qt input module plugin for uim +Group: System/I18n/Japanese +Requires: %{name} = %{version} +Provides: locale(qt3:ja) + +%description qt +Qt input module plugin for uim + + + +Authors: +-------- + Kazuki Ohta + Yamaken + +%prep +%setup0 -q -n uim-%{version} +#%patch0 -p1 +%patch1 -p1 +#%patch3 -p1 +#%patch4 +%patch5 +#%patch6 +%patch7 +for i in $( find . -name ".svn") +do + rm -rf $i +done +cp emacs/README README.emacs +iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs + +%build +rm -f config.cache +# update config.{guess,sub} +%{?suse_update_config} +libtoolize --force --copy +autoreconf --force --install +#export QTDIR=/usr/lib/qt3 +export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" +./configure --prefix=/usr \ + --bindir=%{_bindir} \ + --libdir=%{_libdir} \ + --libexecdir=%{_libdir}/uim \ + --sysconfdir=%{_sysconfdir} \ + --mandir=%{_mandir} \ + --infodir=%{_infodir} \ + --without-m17nlib \ + --with-canna \ + --with-qt \ + --with-qt-immodule \ + %{_target_cpu}-suse-linux +# --disable-scm-nested-eval --enable-callback-queue \ +make + +%install +make DESTDIR=$RPM_BUILD_ROOT install +mkdir -p $RPM_BUILD_ROOT/opt/gnome/{%_lib,bin} +mv $RPM_BUILD_ROOT/%{_libdir}/gtk-* $RPM_BUILD_ROOT/opt/gnome/%_lib/ +mv $RPM_BUILD_ROOT/%{_libdir}/bonobo/ $RPM_BUILD_ROOT/opt/gnome/%_lib/ +mv $RPM_BUILD_ROOT/%{_bindir}/*-gtk-* $RPM_BUILD_ROOT/opt/gnome/bin/ +rm $RPM_BUILD_ROOT/%{_libdir}/uim/plugin/*.*a +# this file is generated by "uim-module-manager". +# touch it here to make sure that it is in the file list of the +# package, then it will be deleted when the package is uninstalled: +touch $RPM_BUILD_ROOT/usr/share/uim/modules +mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/ja +install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-uim \ + $RPM_BUILD_ROOT/etc/X11/xim.d/uim +pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ja + ln -s ../uim 60-uim +popd +# GNU Emacs: +install -m 644 $RPM_SOURCE_DIR/suse-start-uim.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ +pushd $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/uim-el + for i in $(find . -name "*.el") + do + emacs -no-site-file -q -batch -eval '(setq load-path (cons "." load-path))' -f batch-byte-compile $i + done +popd +# XEmacs +mkdir -p $RPM_BUILD_ROOT/usr/share/xemacs/site-packages/lisp/uim-el +install -m 644 emacs/*.el $RPM_BUILD_ROOT/usr/share/xemacs/site-packages/lisp/uim-el +pushd $RPM_BUILD_ROOT/usr/share/xemacs/site-packages/lisp/uim-el + for i in $(find . -name "*.el") + do + xemacs -no-site-file -q -batch -eval '(setq load-path (cons "." load-path))' -f batch-byte-compile $i + done +popd +install -m 644 $RPM_SOURCE_DIR/xemacs-auto-autoloads.el \ + $RPM_BUILD_ROOT/usr/share/xemacs/site-packages/lisp/uim-el/auto-autoloads.el +# replace buildroot in comments in .elc files by spaces with the same total length: +RPM_BUILD_ROOT_REPLACEMENT=$(echo "$RPM_BUILD_ROOT" | tr [:print:] ' ') +for i in $(find $RPM_BUILD_ROOT -name "*.elc") +do + perl -pi -e "s|(;;; from file )$RPM_BUILD_ROOT(/usr/share/xemacs/site-packages/.*)|\1$RPM_BUILD_ROOT_REPLACEMENT\2|" $i + perl -pi -e "s|(;;; from file )$RPM_BUILD_ROOT(/usr/share/emacs/site-lisp/.*)|\1$RPM_BUILD_ROOT_REPLACEMENT\2|" $i +done +%find_lang uim +%find_lang uim-chardict-qt +%suse_update_desktop_file uim System SystemSetup +find $RPM_BUILD_ROOT -name "*.scm" \ + | grep -E -v "installed-modules.scm|loader.scm" \ + | sort | uniq | perl -p -e "s|$RPM_BUILD_ROOT||" >> uim.lang + +%clean +#[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT; + +%post +%run_ldconfig +# register uim modules to uim. This will change the files: +# /usr/share/uim/installed-modules.scm +# /usr/share/uim/loader.scm +# /usr/share/uim/modules +uim-module-manager --register pyload anthy canna skk tcode tutcode hangul viqr ipa-x-sampa latin + + +%postun +%run_ldconfig + +%post gtk2 +# trigger run of SuSEconfig.gtk2 to register/unregister this input module +# by calling gtk-query-immodules-2.0: +touch var/adm/SuSEconfig/run-gtk + +%postun gtk2 +# trigger run of SuSEconfig.gtk2 to register/unregister this input module +# by calling gtk-query-immodules-2.0: +touch var/adm/SuSEconfig/run-gtk + +%files -n uim -f uim.lang +%defattr(-, root, root) +%doc AUTHORS COPYING ChangeLog INSTALL* NEWS* README* +%doc doc +%dir /etc/X11/xim.d/ +/etc/X11/xim.d/* +%dir /usr/share/uim +# autogenerated by uim-module-manager: +%verify(not md5 size mtime) /usr/share/uim/installed-modules.scm +%verify(not md5 size mtime) /usr/share/uim/loader.scm +%verify(not md5 size mtime) /usr/share/uim/modules +%dir /usr/share/uim/pixmaps/ +/usr/share/uim/pixmaps/* +%{_bindir}/uim-sh +%{_bindir}/uim-module-manager +%{_bindir}/uim-xim +%{_bindir}/uim-fep +%{_bindir}/uim-fep-tick +%{_bindir}/uim-el-agent +%{_bindir}/uim-el-helper-agent +%{_libdir}/*.so.* +%dir %{_libdir}/uim/ +%{_libdir}/uim/uim-helper-server +%{_libdir}/uim/uim-toolbar-applet +%{_libdir}/uim/uim-candwin-gtk +%dir %{_libdir}/uim/plugin/ +%{_libdir}/uim/plugin/*.so +%{_mandir}/man1/*.1.gz +/usr/share/applications/%name.desktop +/usr/share/emacs/site-lisp/* +%dir /usr/share/xemacs/site-packages/ +%dir /usr/share/xemacs/site-packages/lisp/ +%dir /usr/share/xemacs/site-packages/lisp/uim-el/ +/usr/share/xemacs/site-packages/lisp/uim-el/* + +%files -n uim-devel +%defattr(-, root, root) +%{_libdir}/*.*a +%{_libdir}/*.so +%dir /usr/include/uim +/usr/include/uim/* +%{_libdir}/pkgconfig/uim.pc + +%files -n uim-gtk2 +%defattr(-, root, root) +%{_bindir}/uim-im-switcher-gtk +%{_bindir}/uim-input-pad-ja +%{_bindir}/uim-toolbar-gtk +%{_bindir}/uim-pref-gtk +/opt/gnome/bin/* +%dir /opt/gnome/%{_lib}/bonobo/ +%dir /opt/gnome/%{_lib}/bonobo/servers/ +/opt/gnome/%{_lib}/bonobo/servers/* +%dir /opt/gnome/%{_lib}/gtk-*/ +%dir /opt/gnome/%{_lib}/gtk-*/*/ +%dir /opt/gnome/%{_lib}/gtk-*/*/immodules/ +/opt/gnome/%{_lib}/gtk-*/*/immodules/* +%dir %{_libdir}/uim/ +%{_libdir}/uim/uim-toolbar-applet + +%files -n uim-qt -f uim-chardict-qt.lang +%defattr(-, root, root) +%{_bindir}/uim-chardict-qt +%{_bindir}/uim-im-switcher-qt +%{_bindir}/uim-pref-qt +%{_bindir}/uim-toolbar-qt +%dir /usr/lib/qt3/plugins/inputmethods/ +/usr/lib/qt3/plugins/inputmethods/*.so +/usr/lib/qt3/plugins/inputmethods/*.la +%dir %{_libdir}/uim/ +%{_libdir}/uim/uim-candwin-qt +%dir /usr/share/uim/ +%dir /usr/share/uim/helperdata/ +/usr/share/uim/helperdata/bushu.t + +%changelog -n uim +* Mon Dec 25 2006 - schwab@suse.de +- Fix format string bugs. +- Make uim-el less chatty. +- Remove inappropriate advice. +- Don't clobber current-input-method-title. +* Fri Sep 15 2006 - mfabian@suse.de +- make auto-autoloads.el for XEmacs really work. +- make vertical candidate list display the default. +* Thu Sep 14 2006 - mfabian@suse.de +- add uim-el for XEmacs. +- byte-compile the .el files for Emacs and XEmacs. +- add suse-start-uim.el for Emacs and auto-autoloads.el for XEmacs + to be able to use uim-el without further setup. +* Mon Sep 11 2006 - mfabian@suse.de +- update to 1.2.1. +- new subpackage uim-qt (used to be build from a different + tarball but it is now included in uim). +* Mon Jun 19 2006 - schwab@suse.de +- Work around broken use of configure substitutions. +* Tue Feb 28 2006 - mfabian@suse.de +- add "Provides: locale(...)". +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Wed Jan 18 2006 - schwab@suse.de +- Fix garbage collector. +- Use RPM_OPT_FLAGS. +- Fix aliasing bugs. +* Fri Aug 26 2005 - mfabian@suse.de +- Bugzilla #113081: uim should register the input modules in the + %%post script. +* Thu Aug 25 2005 - mfabian@suse.de +- Bugzilla #112931: gtk2 specific stuff in %%post and %%postun should + be moved to the proper sub-package. +* Mon Aug 08 2005 - mfabian@suse.de +- update to 0.4.8. +* Tue May 31 2005 - mfabian@suse.de +- update to 0.4.6 svn revison 850. + remove ipa-x-sampa.patch (included). +* Mon Apr 25 2005 - mfabian@suse.de +- update to 0.4.6 svn revision 828. +- fix a small problem in ipa-x-sampa: mnenonic for U+02D0 and + U+02D1 is ':' and ':\' respectively (not ';' and ';\'). +* Thu Feb 24 2005 - mfabian@suse.de +- Bugzilla #66448: update to 0.4.6 svn revision 714 + to fix a security problem (CAN-2005-0503). +* Tue Feb 22 2005 - mfabian@suse.de +- fix typo in /etc/X11/xim.d/uim. +* Tue Feb 22 2005 - mfabian@suse.de +- create start script /etc/X11/xim.d/uim and symlink in ja + subdirectory. +* Sat Jan 08 2005 - mfabian@suse.de +- update to 0.4.5.20050108.165 (fixes crashes and moves the plugins + to the correct directory). +- add anthy, anthy-devel to "# neededforbuild". Previously anthy + was not needed at buildtime but now it is. +- remove dont-use-uim-default-by-default-for-all-languages.patch, + it's not necessary anymore and setting the wildcard for the + direct input method to the empty string instead of "*" makes + uim crash. +* Fri Jan 07 2005 - mfabian@suse.de +- update to 0.4.5.20050107. +- remove uim-toolbar-gtk.patch (now included in tarball). +* Wed Jan 05 2005 - mfabian@suse.de +- update prime.scm to prime_2004-12-13.scm. +* Wed Dec 22 2004 - mfabian@suse.de +- apply uim-toolbar-gtk.patch received from + TOKUNAGA Hiroyuki to make uim-toolbar-gtk work + with gtk+ >= 2.5. +* Fri Dec 17 2004 - mfabian@suse.de +- fix version number in configure.ac. +* Wed Dec 15 2004 - mfabian@suse.de +- update to 0.4.5svn1650. + dont-use-uim-default-by-default-for-all-languages.patch is + apparently not necessary anymore. +* Fri Sep 17 2004 - ro@suse.de +- remove xfce from neededforbuild (unused anyway) +* Sat Sep 04 2004 - mfabian@suse.de +- update to 0.4.3. +* Tue Aug 24 2004 - mfabian@suse.de +- Bugzilla #44155: add /usr/bin/touch to PreReq:. +* Fri Aug 20 2004 - mfabian@suse.de +- update to svn trunk (0.4.2.1.20040820) to fix the switching + between the romaji and kana input mode, see also: + http://freedesktop.org/pipermail/uim/2004-August/000603.html +* Fri Aug 13 2004 - mfabian@suse.de +- update to 0.4.2.1 +- add control-reaches-end-of-non-void-function.patch. +- move uim-helper-candwin-gtk, uim-helper-toolbar-gtk, and + uim-helper-applet to uim-applet sub-package. +* Tue Mar 16 2004 - mfabian@suse.de +- update to 0.3.2. +* Tue Mar 16 2004 - mfabian@suse.de +- make only uim-anthy a default gtk-input-module for Japanese. +- don't use the uim-default input module for any language by + default (This module was used for *all* languages by default, + that means even when running in de_DE.UTF-8 locale, + uim-helper-server would start, which is quite useless). +- add canna canna-devel canna-libs to # neededforbuild in order + to build the uim-canna module as well. +* Fri Mar 05 2004 - mfabian@suse.de +- update to 0.3.1 +- remove uim.patch and warnings.patch (included upstream). +* Thu Feb 26 2004 - mfabian@suse.de +- new package, version 0.3.0.1. diff --git a/version.patch b/version.patch new file mode 100644 index 0000000..dfd471b --- /dev/null +++ b/version.patch @@ -0,0 +1,11 @@ +diff -ru uim-0.4.6.20050425.828.orig/configure.ac uim-0.4.6.20050425.828/configure.ac +--- uim-0.4.6.20050425.828.orig/configure.ac 2005-03-16 07:02:01.000000000 +0100 ++++ uim-0.4.6.20050425.828/configure.ac 2005-04-25 12:26:46.000000000 +0200 +@@ -1,6 +1,6 @@ + AC_PREREQ(2.57) + +-AC_INIT([uim], 0.4.6, [tkng@xem.jp]) ++AC_INIT([uim], 0.4.6.20050425.828, [tkng@xem.jp]) + AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION) + + AC_CONFIG_SRCDIR([COPYING]) diff --git a/xemacs-auto-autoloads.el b/xemacs-auto-autoloads.el new file mode 100644 index 0000000..d8dc629 --- /dev/null +++ b/xemacs-auto-autoloads.el @@ -0,0 +1,73 @@ +;; -*- no-byte-compile: t -*- + +(autoload 'uim-leim-activate "uim-leim") + +;; candidate display style of this buffer +(defvar uim-candidate-display-inline t + "If non-nil, a candidate list is displayed below the +preedit string in vertical direction. Otherwise, it is +displayed at the echo area.") + +(register-input-method "ascii-direct-uim" "English" + 'uim-leim-activate "uim" + "ASCII uim direct") + +(register-input-method "ascii-latin-uim" "English" + 'uim-leim-activate "uim" + "ASCII uim latin") + +(register-input-method "ascii-ipa-x-sampa-uim" "IPA" + 'uim-leim-activate "uim" + "ASCII uim ipa-x-sampa") + +(register-input-method "vietnamese-viqr-uim" "Vietnamese" + 'uim-leim-activate "uim" + "Vietnamese uim viqr") + +(register-input-method "korean-romaja-uim" "Korean" + 'uim-leim-activate "uim" + "Korean uim romaja") + +(register-input-method "korean-hangul3-uim" "Korean" + 'uim-leim-activate "uim" + "Korean uim hangul3") + +(register-input-method "korean-hangul2-uim" "Korean" + 'uim-leim-activate "uim" + "Korean uim hangul2") + +(register-input-method "korean-byeoru-uim" "Korean" + 'uim-leim-activate "uim" + "Korean uim byeoru") + +(register-input-method "japanese-tutcode-uim" "Japanese" + 'uim-leim-activate "uim" + "Japanese uim tutcode") + +(register-input-method "japanese-skk-uim" "Japanese" + 'uim-leim-activate "uim" + "Japanese uim skk") + +(register-input-method "japanese-canna-uim" "Japanese" + 'uim-leim-activate "uim" + "Japanese uim canna") + +(register-input-method "japanese-anthy-uim" "Japanese" + 'uim-leim-activate "uim" + "Japanese uim anthy") + +(register-input-method "chinese-big5-pinyin-big5-uim" "Chinese Big5" + 'uim-leim-activate "uim" + "Chinese Big5 uim pinyin-big5") + +(register-input-method "chinese-gb-pyunihan-uim" "Chinese GB" + 'uim-leim-activate "uim" + "Chinese GB uim pyunihan") + +(register-input-method "chinese-gb-py-uim" "Chinese GB" + 'uim-leim-activate "uim" + "Chinese GB uim py") + + + +