Hello community,
here is the log from the commit of package scim-m17n
checked in at Thu Oct 12 15:45:44 CEST 2006.
--------
--- scim-m17n/scim-m17n.changes 2006-07-17 18:19:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/scim-m17n/scim-m17n.changes 2006-10-12 12:27:02.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Oct 12 12:25:21 CEST 2006 - mfabian@suse.de
+
+- update to 0.2.1
+ • Improve surrounding text support
+- fix build with scim 1.4.5
+
+-------------------------------------------------------------------
Old:
----
scim-m17n-0.2.0.tar.bz2
New:
----
scim-m17n-0.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ scim-m17n.spec ++++++
--- /var/tmp/diff_new_pack.VZdwHU/_old 2006-10-12 15:45:39.000000000 +0200
+++ /var/tmp/diff_new_pack.VZdwHU/_new 2006-10-12 15:45:39.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package scim-m17n (Version 0.2.0)
+# spec file for package scim-m17n (Version 0.2.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,8 +13,8 @@
Name: scim-m17n
#!BuildIgnore: NX
BuildRequires: gcc-c++ libotf-devel m17n-lib-devel scim-devel wordcut-devel
-Version: 0.2.0
-Release: 15
+Version: 0.2.1
+Release: 1
License: GPL
Group: System/I18n/Chinese
Autoreqprov: on
@@ -24,7 +24,7 @@
# CVS:
# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/scim login
# cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/scim co scim-m17n
-Source0: scim-m17n-0.2.0.tar.bz2
+Source0: http://belnet.dl.sourceforge.net/sourceforge/scim/scim-m17n-0.2.1.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: M17N Input Method Engine for SCIM
@@ -51,6 +51,7 @@
James Su
%prep
+%define scim_binary_version %(pkg-config --variable=scim_binary_version scim)
%setup -q -n %{name}-%{version}
find . -name CVS -type d | xargs rm -rf
@@ -68,7 +69,7 @@
%install
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
make DESTDIR=${RPM_BUILD_ROOT} install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/IMEngine/m17n.{a,la}
+rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/m17n.{a,la}
# %find_lang scim-m17n
%clean
@@ -78,12 +79,17 @@
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README ChangeLog
%dir %{_libdir}/scim-1.0/
-%dir %{_libdir}/scim-1.0/IMEngine/
-%{_libdir}/scim-1.0/IMEngine/m17n.so
+%dir %{_libdir}/scim-1.0/%{scim_binary_version}/
+%dir %{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/
+%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/m17n.so
%dir %{_datadir}/scim/icons/
%{_datadir}/scim/icons/scim-m17n.png
%changelog -n scim-m17n
+* Thu Oct 12 2006 - mfabian@suse.de
+- update to 0.2.1
+ • Improve surrounding text support
+- fix build with scim 1.4.5
* Mon Jul 17 2006 - mfabian@suse.de
- add "#!BuildIgnore: NX" to make it build for the
xorg7-SUSE_Factory in the openSUSE build service.
++++++ scim-m17n-0.2.0.tar.bz2 -> scim-m17n-0.2.1.tar.bz2 ++++++
++++ 13774 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-m17n-0.2.0/ChangeLog new/scim-m17n-0.2.1/ChangeLog
--- old/scim-m17n-0.2.0/ChangeLog 2005-04-04 12:31:51.000000000 +0200
+++ new/scim-m17n-0.2.1/ChangeLog 2006-10-10 08:42:10.000000000 +0200
@@ -1,177 +1,253 @@
-2005-04-04 10:1 James Su
+2006-09-24 16:09 James Su
- Files: src/scim_m17n_imengine.cpp (1.13) (+2 -2)
+ * ChangeLog (1.5):
+
+ Updated ChangeLog.
+
+2006-09-24 15:59 James Su
+
+ * configure.ac (1.11), src/scim_m17n_imengine.cpp (1.23):
+
+ Remove "M17N-" from IMEngine's name. Bump version number to 0.2.1
+
+2006-08-23 07:36 James Su
+
+ * src/: scim_m17n_imengine.cpp (1.22), scim_m17n_imengine.h (1.5):
+
+ Improve surrounding text support.
+
+2006-08-22 05:23 James Su
+
+ * src/scim_m17n_imengine.cpp (1.21):
+
+ Return empty surrounding text when get_surrounding_text() failed.
+
+2006-08-18 08:46 James Su
+
+ * src/scim_m17n_imengine.cpp (1.20):
+
+ Uses m17n languages and names as UUIDs instead of a fixed set of
+ pre-allocated UUIDs.by Jens Petersen
+
+2006-01-13 09:48 tag scim_m17n_0_2_0
+
+2006-01-13 09:48 James Su
+
+ * configure.ac (1.10), src/Makefile.am (1.5):
+
+ Export LIBTOOL_EXPORT_OPTIONS.
+
+2006-01-13 09:32 James Su
+
+ * src/scim_m17n_imengine.cpp (1.19):
+
+ Fix type conversion issue on 64bit platform.
+
+2006-01-13 08:44 James Su
+
+ * configure.ac (1.9), src/scim_m17n_imengine.cpp (1.18):
+
+ Ready to release 0.2.0, which is compatible with m17n-lib 1.3.x
+
+2006-01-13 04:13 James Su
+
+ * src/scim_m17n_imengine.cpp (1.17):
+
+ Fixed some bug.
+
+2006-01-06 10:04 James Su
+
+ * src/scim_m17n_imengine.cpp (1.16):
+
+ Fixed some issue of m17n 1.3.0 supporting.
+
+2006-01-01 14:21 James Su
+
+ * src/: scim_m17n_imengine.cpp (1.15), scim_m17n_imengine.h (1.4):
+
+ Updated to support m17n 1.3.0. Implemented lazy loading. Fixed
+ Lookup Table page up/down function.
+
+2005-05-12 01:42 James Su
+
+ * src/: scim_m17n_imengine.cpp (1.14), scim_m17n_imengine.h (1.3):
+
+ Update copyright header.
+
+2005-04-04 10:45 tag scim_m17n_0_1_4
+
+2005-04-04 10:45 James Su
+
+ * scim-m17n.spec.in (1.4):
+
+ Updated spec file.
+
+2005-04-04 10:38 James Su
+
+ * ChangeLog (1.4):
+
+ Updated ChangeLog. Ready to release 0.1.4.
+
+2005-04-04 10:17 James Su
+
+ * src/scim_m17n_imengine.cpp (1.13):
Convert Alt+ into "M-" instead of "A-"
-2005-01-10 10:5 James Su
+2005-01-10 10:53 James Su
- Files: src/scim_m17n_imengine.cpp (1.12) (+67 -3)
+ * src/scim_m17n_imengine.cpp (1.12):
Added more UUIDs.
-2004-12-28 06:4 James Su
+2004-12-28 06:47 James Su
- Files: configure.ac (1.8) (+5 -19)
- src/Makefile.am (1.4) (+2 -2)
- src/scim_m17n_imengine.cpp (1.11) (+22 -1)
+ * configure.ac (1.8), src/Makefile.am (1.4),
+ src/scim_m17n_imengine.cpp (1.11):
Reset IC when focusing out. m17n 1.2.0 is required.
-2004-12-13 16:5 James Su
+2004-12-13 16:53 James Su
- Files: src/scim_m17n_imengine.cpp (1.10) (+3 -3)
+ * src/scim_m17n_imengine.cpp (1.10):
Return true for KeyRelease events to fix the input issue in OOo.
-2004-09-09 15:2 James Su
+2004-09-09 15:20 James Su
- Files: data/scim-m17n.png (1.2) (+10 -2)
- src/scim_m17n_imengine.cpp (1.9) (+2 -2)
+ * data/scim-m17n.png (1.2), src/scim_m17n_imengine.cpp (1.9):
New icon made by Kitae.
-2004-08-29 14:5 James Su
+2004-08-29 14:55 tag scim_m17n_0_1_3
+
+2004-08-29 14:55 James Su
- Files: configure.ac (1.7) (+2 -2)
+ * configure.ac (1.7):
Bump to 0.1.3
-2004-08-24 14:3 James Su
+2004-08-24 14:39 James Su
- Files: src/scim_m17n_imengine.cpp (1.8) (+2 -2)
+ * src/scim_m17n_imengine.cpp (1.8):
Fixed a null pointer bug.
-2004-08-22 13:2 James Su
+2004-08-22 13:24 tag scim_m17n_0_1_2
- Files: ChangeLog (1.3) (+40 -3)
+2004-08-22 13:24 James Su
+
+ * ChangeLog (1.3):
Updated ChangeLog.
-2004-08-22 13:1 James Su
+2004-08-22 13:14 James Su
- Files: configure.ac (1.6) (+1 -1)
- src/Makefile.am (1.3) (+2 -2)
+ * configure.ac (1.6), src/Makefile.am (1.3):
Fixed install dir issue.
-2004-08-22 06:5 James Su
+2004-08-22 06:59 James Su
- Files: configure.ac (1.5) (+10 -4)
- scim-m17n.spec.in (1.3) (+2 -2)
- src/Makefile.am (1.2) (+1 -1)
+ * configure.ac (1.5), scim-m17n.spec.in (1.3), src/Makefile.am
+ (1.2):
Fixed the install dir issue.
-2004-06-21 07:2 James Su
+2004-06-21 07:26 tag scim_m17n_0_1_1
+
+2004-06-21 07:26 James Su
- Files: configure.ac (1.4) (+2 -2)
- src/scim_m17n_imengine.cpp (1.7) (+9 -9)
+ * configure.ac (1.4), src/scim_m17n_imengine.cpp (1.7):
Change __uuids to __m17n_uuids and make it static (private).
-2004-06-20 07:5 James Su
+2004-06-20 07:59 tag scim_m17n_0_1_0
- Files: configure.ac (1.3) (+3 -3)
+2004-06-20 07:59 James Su
+
+ * configure.ac (1.3):
bump the version to 0.1.0.
-2004-06-19 13:3 James Su
+2004-06-19 13:39 James Su
- Files: ChangeLog (1.2) (+90 -0)
+ * scim-m17n.spec.in (1.2):
- Updated ChangeLog.
+ Remove *.{a,la}
-2004-06-19 13:3 James Su
+2004-06-19 13:32 James Su
- Files: scim-m17n.spec.in (1.2) (+2 -0)
+ * ChangeLog (1.2):
- Remove *.{a,la}
+ Updated ChangeLog.
-2004-06-19 10:3 James Su
+2004-06-19 10:36 James Su
- Files: configure.ac (1.2) (+0 -14)
+ * configure.ac (1.2):
Cleanup configure.ac
-2004-06-15 10:4 James Su
+2004-06-15 10:41 James Su
- Files: src/scim_m17n_imengine.cpp (1.6) (+5 -53)
+ * src/scim_m17n_imengine.cpp (1.6):
Use language id directly instead of full language name.
-2004-06-15 05:4 James Su
+2004-06-15 05:49 James Su
- Files: src/scim_m17n_imengine.cpp (1.5) (+2 -2)
+ * src/scim_m17n_imengine.cpp (1.5):
Fixed the handling issue of SCIM_KEY_asciitilde.
-2004-06-15 04:2 James Su
+2004-06-15 04:27 James Su
- Files: Makefile.am (1.2) (+1 -1)
- mkinstalldirs (1.1) ( )
+ * Makefile.am (1.2), mkinstalldirs (1.1):
Added mkinstalldirs
-2004-06-15 03:4 James Su
+2004-06-15 03:41 James Su
- Files: src/scim_m17n_imengine.cpp (1.4) (+5 -5)
+ * src/scim_m17n_imengine.cpp (1.4):
Show preedit, status and candidates when focus in.
-2004-06-15 03:2 James Su
+2004-06-15 03:29 James Su
- Files: src/scim_m17n_imengine.cpp (1.3) (+2 -4)
+ * src/scim_m17n_imengine.cpp (1.3):
Update to use new LookupTable api.
-2004-06-14 09:4 James Su
+2004-06-14 09:45 James Su
- Files: src/scim_m17n_imengine.cpp (1.2) (+89 -3)
- src/scim_m17n_imengine.h (1.2) (+1 -4)
+ * src/: scim_m17n_imengine.cpp (1.2), scim_m17n_imengine.h (1.2):
Candidate now works.
-2004-06-14 08:1 James Su
+2004-06-14 08:14 tag scim_m17n_0
- Files: .cvsignore (1.1) ( )
- AUTHORS (1.1) ( )
- COPYING (1.1) ( )
- ChangeLog (1.1) ( )
- INSTALL (1.1) ( )
- Makefile.am (1.1) ( )
- NEWS (1.1) ( )
- README (1.1) ( )
- THANKS (1.1) ( )
- bootstrap (1.1) ( )
- configure.ac (1.1) ( )
- mkchlog (1.1) ( )
- scim-m17n.spec.in (1.1) ( )
- data/.cvsignore (1.1) ( )
- data/Makefile.am (1.1) ( )
- data/scim-m17n.png (1.1) ( )
- src/.cvsignore (1.1) ( )
- src/Makefile.am (1.1) ( )
- src/scim_m17n_imengine.cpp (1.1) ( )
- src/scim_m17n_imengine.h (1.1) ( )
+2004-06-14 08:14 James Su
- Initial revision
+ * .cvsignore (1.1.1.1), AUTHORS (1.1.1.1), COPYING (1.1.1.1),
+ ChangeLog (1.1.1.1), INSTALL (1.1.1.1), Makefile.am (1.1.1.1), NEWS
+ (1.1.1.1), README (1.1.1.1), THANKS (1.1.1.1), bootstrap (1.1.1.1),
+ configure.ac (1.1.1.1), mkchlog (1.1.1.1), scim-m17n.spec.in
+ (1.1.1.1), data/.cvsignore (1.1.1.1), data/Makefile.am (1.1.1.1),
+ data/scim-m17n.png (1.1.1.1), src/.cvsignore (1.1.1.1),
+ src/Makefile.am (1.1.1.1), src/scim_m17n_imengine.cpp (1.1.1.1),
+ src/scim_m17n_imengine.h (1.1.1.1):
-2004-06-14 08:1 James Su
+ Initial import.
- Files: .cvsignore (1.1.1.1) (+0 -0)
- AUTHORS (1.1.1.1) (+0 -0)
- COPYING (1.1.1.1) (+0 -0)
- INSTALL (1.1.1.1) (+0 -0)
- NEWS (1.1.1.1) (+0 -0)
- README (1.1.1.1) (+0 -0)
- THANKS (1.1.1.1) (+0 -0)
- bootstrap (1.1.1.1) (+0 -0)
- mkchlog (1.1.1.1) (+0 -0)
- data/.cvsignore (1.1.1.1) (+0 -0)
- data/Makefile.am (1.1.1.1) (+0 -0)
- src/.cvsignore (1.1.1.1) (+0 -0)
+2004-06-14 08:14 James Su
- Initial import.
+ * .cvsignore (1.1), AUTHORS (1.1), COPYING (1.1), ChangeLog (1.1),
+ INSTALL (1.1), Makefile.am (1.1), NEWS (1.1), README (1.1), THANKS
+ (1.1), bootstrap (1.1), configure.ac (1.1), mkchlog (1.1),
+ scim-m17n.spec.in (1.1), data/.cvsignore (1.1), data/Makefile.am
+ (1.1), data/scim-m17n.png (1.1), src/.cvsignore (1.1),
+ src/Makefile.am (1.1), src/scim_m17n_imengine.cpp (1.1),
+ src/scim_m17n_imengine.h (1.1):
+
+ Initial revision
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-m17n-0.2.0/Makefile.am new/scim-m17n-0.2.1/Makefile.am
--- old/scim-m17n-0.2.0/Makefile.am 2004-06-15 06:27:56.000000000 +0200
+++ new/scim-m17n-0.2.1/Makefile.am 2006-10-10 08:18:57.000000000 +0200
@@ -37,5 +37,10 @@
## @end 1
ACLOCAL = aclocal -I $(ac_aux_dir)
+.PHONY: update-ChangeLog
+
+update-ChangeLog:
+ /bin/sh $(top_srcdir)/cvs2cl.pl --gmt -P -r -b -T -S -U $(top_srcdir)/developers -f $(top_srcdir)/ChangeLog
+
## @start 2
## docdir = $(top_builddir)/doc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-m17n-0.2.0/configure.ac new/scim-m17n-0.2.1/configure.ac
--- old/scim-m17n-0.2.0/configure.ac 2006-01-13 10:47:25.000000000 +0100
+++ new/scim-m17n-0.2.1/configure.ac 2006-09-24 17:46:40.000000000 +0200
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(scim-m17n, 0.2.0, suzhe@tsinghua.org.cn)
+AC_INIT(scim-m17n, 0.2.1, suzhe@tsinghua.org.cn)
AC_CONFIG_SRCDIR([src/scim_m17n_imengine.h])
# Save this value here, since automake will set cflags and cxxflags later
@@ -8,7 +8,7 @@
SCIM_M17N_MAJOR_VERSION=0
SCIM_M17N_MINOR_VERSION=2
-SCIM_M17N_MICRO_VERSION=0
+SCIM_M17N_MICRO_VERSION=1
SCIM_M17N_VERSION=$SCIM_M17N_MAJOR_VERSION.$SCIM_M17N_MINOR_VERSION.$SCIM_M17N_MICRO_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-m17n-0.2.0/missing new/scim-m17n-0.2.1/missing
--- old/scim-m17n-0.2.0/missing 2004-12-28 06:53:03.000000000 +0100
+++ new/scim-m17n-0.2.1/missing 2006-08-18 10:52:45.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2004-09-07.08
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -19,8 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -87,12 +87,12 @@
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Send bug reports to ."
- exit 0
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing $scriptversion (GNU Automake)"
- exit 0
+ exit $?
;;
-*)
@@ -288,11 +288,18 @@
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-m17n-0.2.0/scim-m17n.spec new/scim-m17n-0.2.1/scim-m17n.spec
--- old/scim-m17n-0.2.0/scim-m17n.spec 2006-01-13 10:47:59.000000000 +0100
+++ new/scim-m17n-0.2.1/scim-m17n.spec 2006-09-24 17:48:54.000000000 +0200
@@ -1,5 +1,5 @@
%define nam scim-m17n
-%define ver 0.2.0
+%define ver 0.2.1
%define rel 1
# Something's not quite right with libtool....
@@ -47,7 +47,7 @@
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} install
-rm -f $RPM_BUILD_ROOT//usr/lib/scim-1.0/IMEngine/m17n.{a,la}
+rm -f $RPM_BUILD_ROOT//usr/lib/scim-1.0/1.4.0/IMEngine/m17n.{a,la}
%clean
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -55,5 +55,5 @@
%files
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README ChangeLog
-/usr/lib/scim-1.0/IMEngine/m17n.so
+/usr/lib/scim-1.0/1.4.0/IMEngine/m17n.so
/usr/share/scim/icons/scim-m17n.png
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-m17n-0.2.0/src/scim_m17n_imengine.cpp new/scim-m17n-0.2.1/src/scim_m17n_imengine.cpp
--- old/scim-m17n-0.2.0/src/scim_m17n_imengine.cpp 2006-01-13 10:32:02.000000000 +0100
+++ new/scim-m17n-0.2.1/src/scim_m17n_imengine.cpp 2006-09-24 17:59:37.000000000 +0200
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: scim_m17n_imengine.cpp,v 1.19 2006/01/13 09:32:02 suzhe Exp $
+ * $Id: scim_m17n_imengine.cpp,v 1.23 2006/09/24 15:59:37 suzhe Exp $
*/
#define Uses_SCIM_UTILITY
@@ -41,146 +41,12 @@
#define scim_imengine_module_init m17n_LTX_scim_imengine_module_init
#define scim_imengine_module_create_factory m17n_LTX_scim_imengine_module_create_factory
-#define SCIM_CONFIG_IMENGINE_M17N_UUID "/IMEngine/M17N/UUID-"
-
#define SCIM_PROP_STATUS "/IMEngine/M17N/Status"
#ifndef SCIM_M17N_ICON_FILE
#define SCIM_M17N_ICON_FILE (SCIM_ICONDIR "/scim-m17n.png")
#endif
-static const size_t __m17n_nr_uuids = 128;
-static const char *__m17n_uuids [] = {
-"de94c8e7-6021-4787-a7ed-0d505bf9eea3",
-"31cfe859-8015-4067-9b75-1615bd54c72d",
-"a3e7a2f8-2f39-4586-b851-80a857b1557d",
-"adfbf67c-156d-44bd-95a7-5827286d6500",
-"682a7366-3f4b-4198-8c42-aebc9def0c36",
-"68243143-85b7-4d88-8aeb-b5232c34004a",
-"a5e616db-63eb-4e10-a15d-4811655af4f3",
-"98ec723d-97a3-4cef-9c0a-df9aa62b6e2e",
-"f42fbcda-d2e9-459b-82b2-396b187dd5c5",
-"7a429b16-8527-4e9e-9783-b30b7d17adaf",
-"d5a0cf07-3b36-4c68-b02d-7ef2c78d8a75",
-"22879d8e-4824-4f70-947c-c0db8037ecd6",
-"65b2743c-c1f0-48c1-be50-ce69a7fa1949",
-"8969bed5-eb7b-441c-8d5e-1de5cf463328",
-"2523be1e-b11c-4921-a1ec-67e483650039",
-"e27d65e3-db40-42ef-a81b-57b762ff7cc0",
-"c5af66e1-f017-490c-9598-fe68fe70818f",
-"12dc8499-4e99-4237-96f6-555a6d6026f0",
-"0f730558-23d2-493a-8bc7-0473ff6125c7",
-"3a80941c-2524-4847-9ded-bf44a355f4de",
-"3ad143b0-480d-48ed-bfb4-9b9b9ba71c0c",
-"415184fb-d645-496f-bbde-f4f8c253395d",
-"ae27032d-6c31-4018-9d13-f1839aab6545",
-"3d102755-fc08-4e24-9b74-218d044f4a29",
-"7dd0fa4a-93ce-466b-8dad-aec41a2a549e",
-"c7b0e37d-4ed0-41a9-8e55-6a882889b09c",
-"f32952ad-4279-4999-8895-ebe6d6c8aa84",
-"b7e3d4e6-e3e0-4a5b-accd-7f911cbdcd36",
-"2bd9599d-708a-4af3-957c-d2621bc622a4",
-"5b5edc0f-510a-49e0-bcdc-cdb2074ae682",
-"d4c08360-d8de-4551-9c9a-e28cb4636a0b",
-"338ecf26-9e73-4dda-ac73-29109fdfdc5e",
-"992b8610-0173-4bdc-bd0b-5e9016219d33",
-"29e26490-02c9-4d43-9668-c043c2e5e3e7",
-"f1ccfd6b-88ba-48e8-a359-7df7371bcd82",
-"1b76eb2c-7982-47d3-af9c-005577e11b12",
-"047a41c8-5da0-4aca-a35f-5f23078840f1",
-"0fc676c9-943a-43f4-be05-e7e43b13b96a",
-"3da743d7-4d5b-4fe4-aa46-597d176fb452",
-"775759d7-49f9-4dd0-a9b6-8ae81bcd899c",
-"234f1592-3180-480c-acf3-2c68e8a4a302",
-"339f0bfe-b947-4f09-b0b0-2682e34872e3",
-"c68ad9a6-8404-4575-9aba-67de51fe6d60",
-"4d6e74ac-d752-4173-a732-a1f667cb1526",
-"b4c8aca2-7cd3-4d3a-a12a-6797fed89851",
-"963a15d2-2384-4543-ac43-e3d1e03c0305",
-"6fd6a47a-2178-437f-9f9d-1ef70f4bb7d7",
-"4b122e93-b6c1-4625-ae4b-1461ee12ade3",
-"439ee607-2e5d-44eb-a164-a6a3122bd5b9",
-"d15a79a9-1f21-438c-9d25-22dca6a3ad38",
-"c19fc0fa-2cfd-449e-82d9-29b07da79b8a",
-"df4e3287-581b-4ce8-9e6a-baebebb0b1a3",
-"84457221-9757-46d4-87c9-27a39b7542cc",
-"9900e41f-9295-45bc-9cb0-440e4198ad46",
-"dea96ada-ea99-4e8a-a0cc-d1b6ae56d702",
-"fe9856d3-1776-47b8-b393-31e2a84431ad",
-"46260747-acd2-4476-864a-8e208e1a48fb",
-"16cefe32-1789-4b1d-b3a5-3cc1e15c8128",
-"dd95ff09-82da-4a3d-b51d-aaeed259002b",
-"d164d5d9-87cb-4ac7-9953-ab28ce37c59f",
-"f74c872c-6ebe-4702-8ef7-c5fd271d36cf",
-"06155ca5-554b-45a7-a04a-907ea38c2979",
-"0a6c1b0c-0c9e-400b-81d0-69b0323fa655",
-"c79aed67-6d75-40af-b2d0-93a1cec5c596",
-"8f0c5c5b-9121-4962-9475-96767eae586e",
-"766656eb-6575-4e16-9d92-c382c1f5f5a2",
-"ff41d2ed-cb47-49b0-920e-06abd0ee277c",
-"7b49235d-7550-4cef-b1d1-0a62fad4bd2c",
-"34cecab5-1f22-431f-a895-e855cbd41bf0",
-"2adfb2f1-6242-4730-996a-18447081670c",
-"3d08446a-389c-4c98-aa84-13960d5cfd3e",
-"92fef7d9-14e1-44df-b5c5-8bd3e4d364af",
-"99bf476f-7746-4b9c-9940-d6f4ca1fcef5",
-"fc738e82-98fc-47a6-87d0-9de582e9f625",
-"8f4b8524-93f6-4792-ac03-f9ca5f0e49ef",
-"c3848b56-0e3c-454c-b859-dddb52a22c42",
-"f5117076-707e-41d5-aef3-381027b020bb",
-"e1dddc6b-c268-4dd5-8629-1d1bdff8efe2",
-"329e9e57-780f-4b1e-8c96-e206cae70fc6",
-"3ec7a83a-883c-4c6d-9f34-f616d7f66227",
-"9b0989dc-047d-4186-93d7-59c4a67792d3",
-"c4366de0-64bd-4672-8613-bf89c269e125",
-"5f11f45c-6545-4d3b-ad95-dc02a1827e55",
-"52ed1916-f753-4eca-89a4-3dd527f6e7dd",
-"5963628b-6cb6-4de5-a531-b05529c3b02f",
-"ed49a819-086f-4e48-b60a-815862049f87",
-"60a4641f-e585-4940-8142-c853c7c81e5a",
-"f85db69b-98b3-42bc-a8f7-c9aff51c93a4",
-"a8866a89-1a9d-4584-a562-3731bb678dae",
-"ab48f3fb-ec6e-4d16-bb89-845122b75f05",
-"5f3881f2-7313-48fa-8ed5-1f3714232829",
-"29cbbd59-ac94-461b-8fdd-537c28c50847",
-"68ddbf8d-ea8a-4163-96ba-e3f711385507",
-"513c0ae8-9a17-4c29-8241-75d803055058",
-"0a87a377-f361-40c7-b183-b74cf378d642",
-"9a418ce6-0ee6-459d-9f2e-69c1d33a854c",
-"d5f5fbcc-2496-41f7-aa5f-d934e88c72fc",
-"e439ccdc-d2a2-4949-b658-691be51866fc",
-"b5e808c0-72f7-4ba7-a4d7-29d8ee6f33b7",
-"022b8e62-5721-4144-8c90-0f87a194c3cb",
-"8db6baad-72cb-485f-859d-7a85d3e2ecc7",
-"1929ea7b-bdf3-4e63-8c81-ebe95e1274a1",
-"f25a4891-1a69-4190-8143-ba2e9d6dfa4e",
-"92a12eba-988c-47d4-a473-8a83814a142e",
-"38c502a8-8de1-47de-a9c1-f1f9a35f4689",
-"740218f0-8aca-433a-88c2-3b2e077df8e4",
-"98d3e84e-e78e-40e4-bf4c-bc95bfcb37a5",
-"b0bd43a3-c537-4934-802b-a4cccd20b7e7",
-"61d4b4ef-b1a1-42fd-9e00-da0e148501f0",
-"b29c4400-b880-4a03-9a80-a1d48dcb8b30",
-"4d00c0b3-4f1e-4b9e-832d-c5904d48e5d9",
-"a1e45eb5-fc35-4455-ab8a-71acbc33d95f",
-"e9c7013a-7630-4310-a4a1-c2ec67f76c7a",
-"04ab7e89-bdba-4f5e-9442-6f653acf04f2",
-"dee60281-0dbb-4d1b-a989-6ee89f4c9250",
-"c0ee3079-2c0c-4b4b-894f-beb5404162f5",
-"fb17e4fc-9901-4c44-9e7f-7b179276066d",
-"d502438f-4e0e-4d39-ab9b-883cf15695c2",
-"f3537cf5-6e82-4162-9eca-ffd1a9bd5bb9",
-"aa91350b-a0b7-4ce2-ac82-1c208dddcfce",
-"2d2d2a6f-64a6-49b4-af11-25c49857bbc6",
-"8ac094fb-2b1b-4eeb-be91-4c87f1c7e34b",
-"7ab49ede-33da-4ce2-9d6c-7ee83a61cc43",
-"1cab3d11-1fe8-4bbe-8759-4844939f486c",
-"f36a0c58-f71e-4539-a43e-cad371c71d52",
-"f6b7b374-be88-4022-ac10-d5c47998a9b4",
-"b6fd6dd7-f4fe-4860-b92d-272f8cba616c",
-"d1c01bd6-ad12-42b8-9b73-47e51fcff098"
-};
-
struct M17NInfo {
String lang;
String name;
@@ -245,46 +111,19 @@
__m17n_input_methods.push_back (info);
- if (++count >= __m17n_nr_uuids) break;
+ count++;
}
}
}
if (imlist) m17n_object_unref(imlist);
- // Get all uuids.
+ // Set uuids.
for (i = 0; i < count; ++i)
- __m17n_input_methods [i].uuid = config->read (String (SCIM_CONFIG_IMENGINE_M17N_UUID) +
- __m17n_input_methods [i].lang +
- String ("-") +
- __m17n_input_methods [i].name,
- String (""));
-
- // Allocate uuids for the IMs without uuid.
- for (i = 0; i < count; ++i) {
- if (!__m17n_input_methods [i].uuid.length ()) {
- for (size_t j = 0; j < __m17n_nr_uuids; ++j) {
- size_t k = 0;
- for (; k < count; ++k)
- if (String (__m17n_uuids [j]) == __m17n_input_methods [k].uuid) break;
-
- if (k == count) {
-
- SCIM_DEBUG_IMENGINE(1) << "Set UUID: " << __m17n_uuids [j] << " -> "
- << __m17n_input_methods [i].lang << "-"
- << __m17n_input_methods [i].name << "\n";
-
- __m17n_input_methods [i].uuid = __m17n_uuids [j];
- config->write (String (SCIM_CONFIG_IMENGINE_M17N_UUID) +
- __m17n_input_methods [i].lang +
- String ("-") +
- __m17n_input_methods [i].name,
- String (__m17n_uuids [j]));
- break;
- }
- }
- }
- }
+ __m17n_input_methods [i].uuid = String ("IMEngine-M17N-" +
+ __m17n_input_methods [i].lang +
+ String ("-") +
+ __m17n_input_methods [i].name);
return count;
}
@@ -348,7 +187,7 @@
WideString
M17NFactory::get_name () const
{
- return utf8_mbstowcs (String ("M17N-") + m_lang + String ("-") + m_name);
+ return utf8_mbstowcs (m_lang + String ("-") + m_name);
}
WideString
@@ -583,6 +422,12 @@
{
}
+void
+M17NInstance::update_client_capabilities (unsigned int cap)
+{
+ m_cap = cap;
+}
+
static M17NInstance *
__find_instance (MInputContext *ic)
{
@@ -850,19 +695,19 @@
{
M17NInstance *this_ptr = __find_instance (ic);
- if (this_ptr) {
+ if (this_ptr && (this_ptr->m_cap & SCIM_CLIENT_CAP_SURROUNDING_TEXT)) {
SCIM_DEBUG_IMENGINE(2) << "get_surrounding_text_cb.\n";
if (ic->plist && mplist_key (ic->plist) == Minteger) {
int len = (int) ((size_t) mplist_value (ic->plist));
int cursor;
WideString wstr;
+ MText *txt = mtext ();
if (this_ptr->get_surrounding_text (wstr, cursor, (len < 0) ? (-len) : 0, (len > 0) ? len : 0)) {
- MText *txt = mtext ();
for (WideString::const_iterator i = wstr.begin (); i != wstr.end (); ++i)
mtext_cat_char (txt, (int) *i);
- mplist_set (ic->plist, Mtext, txt);
- m17n_object_unref (txt);
}
+ mplist_set (ic->plist, Mtext, txt);
+ m17n_object_unref (txt);
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/scim-m17n-0.2.0/src/scim_m17n_imengine.h new/scim-m17n-0.2.1/src/scim_m17n_imengine.h
--- old/scim-m17n-0.2.0/src/scim_m17n_imengine.h 2006-01-01 15:21:02.000000000 +0100
+++ new/scim-m17n-0.2.1/src/scim_m17n_imengine.h 2006-08-23 09:36:19.000000000 +0200
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: scim_m17n_imengine.h,v 1.4 2006/01/01 14:21:02 suzhe Exp $
+ * $Id: scim_m17n_imengine.h,v 1.5 2006/08/23 07:36:19 suzhe Exp $
*/
#if !defined (__SCIM_M17N_IMENGINE_H)
@@ -67,6 +67,7 @@
class M17NInstance : public IMEngineInstanceBase
{
MInputContext *m_ic;
+ unsigned int m_cap;
public:
M17NInstance (M17NFactory *factory,
const String &encoding,
@@ -84,6 +85,7 @@
virtual void focus_in ();
virtual void focus_out ();
virtual void trigger_property (const String &property);
+ virtual void update_client_capabilities (unsigned int cap);
private:
bool m17n_process_key (MSymbol key);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org