This commit is contained in:
parent
4b9609aef9
commit
da8c99f4c4
@ -1,24 +0,0 @@
|
||||
diff -ru uim-1.2.1.orig/xim/locale.cpp uim-1.2.1/xim/locale.cpp
|
||||
--- uim-1.2.1.orig/xim/locale.cpp 2006-08-14 06:27:37.000000000 +0200
|
||||
+++ uim-1.2.1/xim/locale.cpp 2008-01-11 22:36:04.000000000 +0100
|
||||
@@ -37,6 +37,8 @@
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <locale.h>
|
||||
#include <iconv.h>
|
||||
#include <errno.h>
|
||||
uim-1.2.1/ximだけに発見: locale.cpp~
|
||||
diff -ru uim-1.2.1.orig/xim/ximserver.cpp uim-1.2.1/xim/ximserver.cpp
|
||||
--- uim-1.2.1.orig/xim/ximserver.cpp 2006-08-14 06:27:37.000000000 +0200
|
||||
+++ uim-1.2.1/xim/ximserver.cpp 2008-01-11 22:28:06.000000000 +0100
|
||||
@@ -35,6 +35,7 @@
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
#include <ctype.h>
|
||||
#include <locale.h>
|
||||
#include <X11/Xlib.h>
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:73cc3e01990f2a3110ea00eed5d5b1f26082f3d02cbb46b23573ca7d1fddc932
|
||||
size 1669647
|
3
uim-1.5.6.tar.bz2
Normal file
3
uim-1.5.6.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ce6b7218c3b79e5d100d52fa745e51abc83a1fe7668b3b759584b9ec7a00c28f
|
||||
size 3343584
|
@ -1,73 +0,0 @@
|
||||
--- 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;
|
@ -1,26 +0,0 @@
|
||||
--- 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])
|
137
uim-el.patch
137
uim-el.patch
@ -1,137 +0,0 @@
|
||||
--- 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))
|
||||
|
||||
|
||||
|
@ -1,23 +0,0 @@
|
||||
Index: uim-1.2.1/configure.ac
|
||||
===================================================================
|
||||
--- uim-1.2.1.orig/configure.ac
|
||||
+++ uim-1.2.1/configure.ac
|
||||
@@ -378,14 +378,14 @@ AC_ARG_ENABLE(applet,
|
||||
use_applet="no"
|
||||
;;
|
||||
yes|*)
|
||||
- PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0, use_applet="yes",use_applet="no")
|
||||
- PKG_CHECK_MODULES(APPLET_2_14, libpanelapplet-2.0 >= 2.14.0, panelapplet_have_set_background_api="yes",panelapplet_have_set_background_api="no")
|
||||
+ PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0 libgnomeui-2.0, use_applet="yes",use_applet="no")
|
||||
+ PKG_CHECK_MODULES(APPLET_2_14, libpanelapplet-2.0 >= 2.14.0 libgnomeui-2.0, panelapplet_have_set_background_api="yes",panelapplet_have_set_background_api="no")
|
||||
;;
|
||||
esac
|
||||
],
|
||||
[
|
||||
- PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0, use_applet="yes",use_applet="no")
|
||||
- PKG_CHECK_MODULES(APPLET_2_14, libpanelapplet-2.0 >= 2.14.0, panelapplet_have_set_background_api="yes",panelapplet_have_set_background_api="no")
|
||||
+ PKG_CHECK_MODULES(APPLET, libpanelapplet-2.0 libgnomeui-2.0, use_applet="yes",use_applet="no")
|
||||
+ PKG_CHECK_MODULES(APPLET_2_14, libpanelapplet-2.0 >= 2.14.0 libgnomeui-2.0, panelapplet_have_set_background_api="yes",panelapplet_have_set_background_api="no")
|
||||
])
|
||||
|
||||
if test x"$panelapplet_have_set_background_api" = xyes; then
|
45
uim-gnome-build-fixes.diff
Normal file
45
uim-gnome-build-fixes.diff
Normal file
@ -0,0 +1,45 @@
|
||||
---
|
||||
helper/toolbar-applet-gnome.c | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
--- a/helper/toolbar-applet-gnome.c
|
||||
+++ b/helper/toolbar-applet-gnome.c
|
||||
@@ -38,7 +38,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <locale.h>
|
||||
#include <panel-applet.h>
|
||||
-#include <gnome.h>
|
||||
#include <libgnome/libgnome.h>
|
||||
#include <uim/uim.h>
|
||||
|
||||
@@ -155,20 +154,21 @@
|
||||
const gchar *verbname)
|
||||
{
|
||||
GdkPixbuf *icon = NULL;
|
||||
- GtkWidget *dialog;
|
||||
+ GtkAboutDialog *dialog;
|
||||
const gchar *authors[] = {"uim Project", NULL};
|
||||
/* Feel free to put your names here translators */
|
||||
gchar *translators = _("TRANSLATORS");
|
||||
icon = gdk_pixbuf_new_from_file(UIM_PIXMAPSDIR "/uim-icon.png", NULL);
|
||||
|
||||
- dialog = gnome_about_new(_("uim Applet"), VERSION,
|
||||
- "Copyright \xc2\xa9 2003-2009 uim Project.",
|
||||
- _("Applet for indicating uim's status"),
|
||||
- authors,
|
||||
- NULL,
|
||||
- strcmp("TRANSLATORS", translators) ? translators
|
||||
- : NULL,
|
||||
- icon);
|
||||
+ dialog = gtk_about_dialog_new();
|
||||
+ gtk_about_dialog_set_name(dialog, _("uim Applet"));
|
||||
+ gtk_about_dialog_set_version(dialog, VERSION);
|
||||
+ gtk_about_dialog_set_copyright(dialog, "Copyright \xc2\xa9 2003-2009 uim Project.");
|
||||
+ gtk_about_dialog_set_comments(dialog, _("Applet for indicating uim's status"));
|
||||
+ gtk_about_dialog_set_authors(dialog, authors);
|
||||
+ if (strcmp("TRANSLATORS", translators))
|
||||
+ gtk_about_dialog_set_translator_credits(dialog, translators);
|
||||
+ gtk_about_dialog_set_logo(dialog, icon);
|
||||
|
||||
if (icon) {
|
||||
gtk_window_set_icon(GTK_WINDOW(dialog), icon);
|
27
uim-sigscheme-build-fixes.diff
Normal file
27
uim-sigscheme-build-fixes.diff
Normal file
@ -0,0 +1,27 @@
|
||||
---
|
||||
sigscheme/Makefile.am | 2 ++
|
||||
sigscheme/libgcroots/Makefile.am | 2 ++
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
--- a/sigscheme/Makefile.am
|
||||
+++ b/sigscheme/Makefile.am
|
||||
@@ -4,6 +4,8 @@
|
||||
endif
|
||||
SUBDIRS += include src lib test test-c bench
|
||||
|
||||
+ACLOCAL_AMFLAGS = -I m4
|
||||
+
|
||||
# To make 'make distclean' workable on --with-libgcroots=tiny-subdir,
|
||||
# libgcroots must be eliminated from $DIST_SUBDIRS.
|
||||
DIST_SUBDIRS = $(SUBDIRS)
|
||||
--- a/sigscheme/libgcroots/Makefile.am
|
||||
+++ b/sigscheme/libgcroots/Makefile.am
|
||||
@@ -19,6 +19,8 @@
|
||||
|
||||
include libtool-version.mk
|
||||
|
||||
+ACLOCAL_AMFLAGS = -I m4
|
||||
+
|
||||
# $(distdir) does work as a part of $(RELEASE_URL) when configured as a
|
||||
# subpackage.
|
||||
DIST_NAME = $(PACKAGE)-$(VERSION)
|
@ -1,17 +0,0 @@
|
||||
--- 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 ();
|
||||
}
|
14
uim.changes
14
uim.changes
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 9 08:33:33 CEST 2009 - tiwai@suse.de
|
||||
|
||||
- removed unused patches
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 2 12:15:14 CEST 2009 - tiwai@suse.de
|
||||
|
||||
- updated to version 1.5.6:
|
||||
* lots of changes, see
|
||||
http://uim.googlecode.com/svn/tags/uim-1.5.6/NEWS
|
||||
- enable qt4 immodule
|
||||
- enable anthy-utf8 IM
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 4 16:04:31 CEST 2009 - tiwai@suse.de
|
||||
|
||||
|
@ -1,12 +0,0 @@
|
||||
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
|
||||
|
230
uim.spec
230
uim.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package uim (Version 1.2.1)
|
||||
# spec file for package uim (Version 1.5.6)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -19,8 +19,13 @@
|
||||
|
||||
|
||||
Name: uim
|
||||
BuildRequires: anthy-devel canna-devel emacs-x11 gcc-c++ gnome-panel-devel gtk2-devel intltool libgnomeui-devel ncurses-devel perl-XML-Parser pkg-config qt3-devel update-desktop-files xemacs
|
||||
BuildRequires: anthy-devel canna-devel emacs-x11 gcc-c++ intltool
|
||||
BuildRequires: gnome-panel-devel gtk2-devel libgnomeui-devel
|
||||
BuildRequires: ncurses-devel perl-XML-Parser pkg-config update-desktop-files
|
||||
BuildRequires: emacs-x11 xemacs
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: libqt4-devel
|
||||
%if %suse_version > 1020
|
||||
BuildRequires: fdupes
|
||||
%endif
|
||||
@ -30,29 +35,23 @@ Group: System/I18n/Japanese
|
||||
AutoReqProv: on
|
||||
PreReq: %{_bindir}/touch
|
||||
Provides: locale(xorg-x11:ja)
|
||||
Version: 1.2.1
|
||||
Release: 278
|
||||
Version: 1.5.6
|
||||
Release: 1
|
||||
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
|
||||
Source0: http://uim.freedesktop.org/releases/uim-%{version}.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
|
||||
Patch8: missing-header.patch
|
||||
Patch9: uim-fix-gnome-compilation.patch
|
||||
Patch10: uim-sigscheme-build-fixes.diff
|
||||
Patch11: uim-gnome-build-fixes.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Summary: a multilingual input method library
|
||||
Summary: A multilingual input method library
|
||||
|
||||
%description
|
||||
Uim is a multilingual input method library. Uim's project goal is to
|
||||
@ -71,7 +70,7 @@ Authors:
|
||||
|
||||
%package devel
|
||||
License: GPL v2 or later
|
||||
Summary: Include Files and Libraries mandatory for Development.
|
||||
Summary: Include Files and Libraries mandatory for Development
|
||||
Group: System/I18n/Japanese
|
||||
Requires: %{name} = %{version} glibc-devel
|
||||
|
||||
@ -112,13 +111,31 @@ Authors:
|
||||
|
||||
%package qt
|
||||
License: GPL v2 or later
|
||||
Summary: Qt input module plugin for uim
|
||||
Summary: Qt3 input module plugin for uim
|
||||
Group: System/I18n/Japanese
|
||||
Requires: %{name} = %{version}
|
||||
Provides: locale(qt3:ja)
|
||||
|
||||
%description qt
|
||||
Qt input module plugin for uim
|
||||
Qt3 input module plugin for uim
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Kazuki Ohta <mover@hct.zaq.ne.jp>
|
||||
Yamaken <yamaken@bp.iij4u.or.jp>
|
||||
|
||||
%package qt4
|
||||
License: GPL v2 or later
|
||||
Summary: Qt4 input module plugin for uim
|
||||
Group: System/I18n/Japanese
|
||||
Requires: %{name} = %{version}
|
||||
Requires: uim-qt = %{version}
|
||||
Provides: locale(libqt4:ja)
|
||||
|
||||
%description qt4
|
||||
Qt4 input module plugin for uim
|
||||
|
||||
|
||||
|
||||
@ -128,16 +145,12 @@ Authors:
|
||||
Yamaken <yamaken@bp.iij4u.or.jp>
|
||||
|
||||
%prep
|
||||
%setup0 -q -n uim-%{version}
|
||||
#%patch0 -p1
|
||||
%setup0 -q
|
||||
%patch1 -p1
|
||||
#%patch3 -p1
|
||||
#%patch4
|
||||
%patch5
|
||||
#%patch6
|
||||
%patch7
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%if %suse_version >= 1110
|
||||
%patch11 -p1
|
||||
%endif
|
||||
cp emacs/README README.emacs
|
||||
iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs
|
||||
|
||||
@ -149,14 +162,20 @@ intltoolize --force -c --automake
|
||||
--libexecdir=%{_prefix}/lib/uim \
|
||||
--without-m17nlib\
|
||||
--with-canna\
|
||||
--with-anthy-utf8 \
|
||||
--with-qt\
|
||||
--with-qt-immodule
|
||||
--with-qt-immodule \
|
||||
--with-qt4-immodule \
|
||||
--with-libedit
|
||||
# --disable-scm-nested-eval --enable-callback-queue\
|
||||
make
|
||||
make %{?jobs:-j %jobs}
|
||||
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
%makeinstall
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a $RPM_BUILD_ROOT%{_prefix}/lib*/*/*/*/*.*a
|
||||
# gcroots devel -- we don't need it, right?
|
||||
rm -f $RPM_BUILD_ROOT%{_includedir}/gcroots.h
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gcroots.pc
|
||||
# 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:
|
||||
@ -194,7 +213,11 @@ do
|
||||
perl -pi -e "s|(;;; from file )$RPM_BUILD_ROOT(%{_datadir}/emacs/site-lisp/.*)|\1$RPM_BUILD_ROOT_REPLACEMENT\2|" $i
|
||||
done
|
||||
%find_lang uim
|
||||
%if %suse_version > 1100
|
||||
touch uim-chardict-qt.lang
|
||||
%else
|
||||
%find_lang uim-chardict-qt
|
||||
%endif
|
||||
%suse_update_desktop_file uim System SystemSetup
|
||||
find $RPM_BUILD_ROOT -name "*.scm" \
|
||||
| grep -E -v "installed-modules.scm|loader.scm" \
|
||||
@ -207,15 +230,15 @@ find $RPM_BUILD_ROOT -name "*.scm" \
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
%run_ldconfig
|
||||
/sbin/ldconfig
|
||||
# register uim modules to uim. This will change the files:
|
||||
# %{_datadir}/uim/installed-modules.scm
|
||||
# %{_datadir}/uim/loader.scm
|
||||
# %{_datadir}/uim/modules
|
||||
uim-module-manager --register pyload anthy canna skk tcode tutcode hangul viqr ipa-x-sampa latin
|
||||
uim-module-manager --register pyload anthy anthy-utf8 canna skk tcode tutcode hangul viqr ipa-x-sampa latin
|
||||
|
||||
%postun
|
||||
%run_ldconfig
|
||||
/sbin/ldconfig
|
||||
|
||||
%post gtk2
|
||||
# trigger run of SuSEconfig.gtk2 to register/unregister this input module
|
||||
@ -234,6 +257,7 @@ touch var/adm/SuSEconfig/run-gtk
|
||||
%dir /etc/X11/xim.d/
|
||||
/etc/X11/xim.d/*
|
||||
%dir %{_datadir}/uim
|
||||
%dir %{_datadir}/uim/lib
|
||||
# autogenerated by uim-module-manager:
|
||||
%ghost %{_datadir}/uim/installed-modules.scm
|
||||
%ghost %{_datadir}/uim/loader.scm
|
||||
@ -294,142 +318,8 @@ touch var/adm/SuSEconfig/run-gtk
|
||||
%dir %{_datadir}/uim/helperdata/
|
||||
%{_datadir}/uim/helperdata/bushu.t
|
||||
|
||||
%files -n uim-qt4 -f uim-chardict-qt.lang
|
||||
%defattr(-, root, root)
|
||||
%{_libdir}/qt4/plugins/inputmethods/*
|
||||
|
||||
%changelog
|
||||
* Thu Jun 04 2009 tiwai@suse.de
|
||||
- fix build for older distros
|
||||
* Mon Feb 23 2009 vuntz@novell.com
|
||||
- Add uim-fix-gnome-compilation.patch to fix build. The patch
|
||||
should probably be sent upstream if the latest version still has
|
||||
the issue (upstream is at 1.5.5 now).
|
||||
- Add libgnomeui-devel BuildRequires for the patch.
|
||||
* Tue Nov 25 2008 sbrabec@suse.cz
|
||||
- Supplement gtk2-32bit/gtk2-64bit and qt3-32bit/qt3-64bit in
|
||||
baselibs.conf (bnc#354164).
|
||||
* Fri Oct 17 2008 mfabian@suse.de
|
||||
- bnc#436245: Emacs cannot start flawlessly from within a directory
|
||||
containing umlauts in it's name: fix by loading uim-leim
|
||||
not immediately in suse-start-uim.el but rather load it in
|
||||
'emacs-startup-hook.
|
||||
(Fixed by Werner Fink <werner@suse.de>).
|
||||
- fix build in Factory (add “intltoolize --force -c --automake”)
|
||||
* Fri Jan 11 2008 mfabian@suse.de
|
||||
- include missing headers to make it build on STABLE.
|
||||
- use fdupes
|
||||
* Mon May 07 2007 mfabian@suse.de
|
||||
- Bugzilla #271696: fix bug in uim start script which made it
|
||||
impossible to set uim as the default input method.
|
||||
Thanks to Satoshi Niimi <sa2c@sa2c.net> for the report and the
|
||||
fix.
|
||||
* Sat Mar 31 2007 aj@suse.de
|
||||
- Cleanup BuildRequires.
|
||||
* Tue Feb 06 2007 ro@suse.de
|
||||
- fix build
|
||||
* Fri Feb 02 2007 sbrabec@suse.cz
|
||||
- Removed references to /opt/gnome.
|
||||
- Bi-arch libexecdir fix.
|
||||
- Package each file only once.
|
||||
- Use %%ghost for autogenerated files.
|
||||
* 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 <tkng@xem.jp> 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.
|
||||
* Wed Mar 17 2004 mfabian@suse.de
|
||||
- update to 0.3.2.
|
||||
* Wed Mar 17 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.
|
||||
|
@ -1,11 +0,0 @@
|
||||
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])
|
Loading…
x
Reference in New Issue
Block a user