Hello community,
here is the log from the commit of package m17n-lib for openSUSE:Factory checked in at 2012-02-01 13:16:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/m17n-lib (Old)
and /work/SRC/openSUSE:Factory/.m17n-lib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "m17n-lib", Maintainer is "FJKong@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/m17n-lib/m17n-lib.changes 2011-09-23 02:12:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.m17n-lib.new/m17n-lib.changes 2012-02-01 13:16:41.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Jan 31 17:21:44 CET 2012 - tiwai@suse.de
+
+- updated to version 1.6.3:
+ Minor bugs fixed and several new input methods added, including
+ the segfault fix with VLC
+
+-------------------------------------------------------------------
Old:
----
m17n-lib-1.6.2.tar.gz
New:
----
m17n-lib-1.6.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ m17n-lib.spec ++++++
--- /var/tmp/diff_new_pack.spJyP9/_old 2012-02-01 13:16:47.000000000 +0100
+++ /var/tmp/diff_new_pack.spJyP9/_new 2012-02-01 13:16:47.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package m17n-lib
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,16 +15,21 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
Name: m17n-lib
-BuildRequires: freetype2-devel fribidi-devel gd-devel ispell ispell-british libotf-devel libxml2 m17n-db pkgconfig wordcut-devel xorg-x11-devel
+BuildRequires: freetype2-devel
+BuildRequires: fribidi-devel
+BuildRequires: gd-devel
+BuildRequires: ispell
+BuildRequires: ispell-british
+BuildRequires: libotf-devel
+BuildRequires: libxml2
+BuildRequires: m17n-db
+BuildRequires: pkgconfig
+BuildRequires: wordcut-devel
+BuildRequires: xorg-x11-devel
%define appdefdir /usr/share/X11
-Version: 1.6.2
-Release: 1
-License: GPL-2.0+ ; LGPL-2.1+ ; MIT
-Group: System/I18n/Japanese
-AutoReqProv: on
+Version: 1.6.3
+Release: 0
Url: http://www.m17n.org/m17n-lib/
Source0: http://www.m17n.org/m17n-lib-download/m17n-lib-%{version}.tar.gz
Source1: m17n-lib-rpmlintrc
@@ -32,6 +37,8 @@
Patch0: m17n-lib-fix-warnings.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Multilingual Text Processing Library for the C Language
+License: GPL-2.0+ ; LGPL-2.1+ ; MIT
+Group: System/I18n/Japanese
%description
A multilingual text processing library for the C language.
@@ -48,7 +55,6 @@
This package contains shared libraries.
%package devel
-License: GPL-2.0+ ; LGPL-2.1+ ; MIT
Summary: Multilingual text processing library for the C language
Group: Development/Libraries/Other
Requires: %{name} = %{version} glibc-devel xorg-x11-libX11-devel
++++++ m17n-lib-1.6.2.tar.gz -> m17n-lib-1.6.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/ChangeLog new/m17n-lib-1.6.3/ChangeLog
--- old/m17n-lib-1.6.2/ChangeLog 2010-10-04 07:42:49.000000000 +0200
+++ new/m17n-lib-1.6.3/ChangeLog 2011-10-11 02:36:20.000000000 +0200
@@ -1,7 +1,30 @@
-2010-10-04 Kenichi Handa
+2011-10-11 Kenichi Handa
+
+ * Version 1.6.3 released.
+
+2011-09-12 Kenichi Handa
+
+ * configure.ac: Version changed to 1.6.3.
+
+2011-02-21 Daiki Ueno (tiny change)
+
+ * m17n-core.pc.in (moduledir): Use ${libdir} instead of
+ ${exec_prefix}/lib.
+
+ * m17n-shell.pc.in (moduledir): Likewise.
+
+ * m17n-flt.pc.in (moduledir): Likewise.
+
+ * m17n-gui.pc.in (moduledir): Likewise.
+
+2011-01-12 Kenichi Handa
* Version 1.6.2 released.
+2011-01-12 Kenichi Handa
+
+ * Makefile.am: Update copyright year.
+
2010-09-24 Kenichi Handa
* configure.ac (AC_CONFIG_HEADERS): Put config.h in the top
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/Makefile.am new/m17n-lib-1.6.3/Makefile.am
--- old/m17n-lib-1.6.2/Makefile.am 2010-08-27 04:22:35.000000000 +0200
+++ new/m17n-lib-1.6.3/Makefile.am 2011-01-12 07:27:14.000000000 +0100
@@ -1,5 +1,5 @@
# Makefile.am -- top level Makefile for the m17n library.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
# National Institute of Advanced Industrial Science and Technology (AIST)
# Registration Number H15PRO112
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/Makefile.in new/m17n-lib-1.6.3/Makefile.in
--- old/m17n-lib-1.6.2/Makefile.in 2010-10-05 02:19:54.000000000 +0200
+++ new/m17n-lib-1.6.3/Makefile.in 2011-09-12 06:43:43.000000000 +0200
@@ -16,7 +16,7 @@
@SET_MAKE@
# Makefile.am -- top level Makefile for the m17n library.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
# National Institute of Advanced Industrial Science and Technology (AIST)
# Registration Number H15PRO112
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/NEWS new/m17n-lib-1.6.3/NEWS
--- old/m17n-lib-1.6.2/NEWS 2010-09-22 05:37:06.000000000 +0200
+++ new/m17n-lib-1.6.3/NEWS 2011-09-12 02:58:44.000000000 +0200
@@ -1,10 +1,15 @@
* NEWS -- What's new in the m17n library. -*- outline -*-
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H15PRO112
See the end for copying conditions.
+* Changes in the m17n library 1.6.3
+
+This release is just for bug fixing.
+
+
* Changes in the m17n library 1.6.2
This release is just for bug fixing.
@@ -214,7 +219,7 @@
* Copyright information
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H15PRO112
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/README new/m17n-lib-1.6.3/README
--- old/m17n-lib-1.6.2/README 2010-09-22 05:26:06.000000000 +0200
+++ new/m17n-lib-1.6.3/README 2011-09-12 02:58:18.000000000 +0200
@@ -1,6 +1,6 @@
-This directory tree holds version 1.6.2 of the m17n library. -*- text -*-
+This directory tree holds version 1.6.3 of the m17n library. -*- text -*-
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H15PRO112
See the end for copying conditions.
@@ -17,14 +17,8 @@
the script runs successfully with these versions of tools.
libtool automake autoconf gettext pkg-config
- Debian Lenny 1.5.26 1.10.1 2.61 0.17 0.22
- Debian Sid 2.2.6b 1.11.1 2.67 0.18.1 0.25
- Ubunto 8.4(*1) 1.5.26 1.10.1 2.61 0.17 0.22
- Ubunto 9.10 2.2.4 1.9.6 2.61 0.17 0.22
+ Ubunto 9.10 2.2.6b 1.11.1 2.66 0.17 0.22
Ubunto 10.4 2.2.6b 1.11.1 2.65 0.17 0.22
- Fedra 12 2.2.6b 1.11.1 2.63 0.17 0.23
- Fedra 13 2.2.6b 1.11.1 2.65 0.18.1 0.23
- OpenSUSE 11.3 2.2.6b 1.11.1 2.65 0.17 0.23
(*1) bootstrap.sh prints lots of warning something like this:
------------------------------------------------------------
@@ -169,7 +163,7 @@
----------------------------------------------------------------------
Copyright information
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H15PRO112
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/configure new/m17n-lib-1.6.3/configure
--- old/m17n-lib-1.6.2/configure 2010-10-05 02:19:51.000000000 +0200
+++ new/m17n-lib-1.6.3/configure 2011-09-12 06:43:40.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for m17n-lib 1.6.2.
+# Generated by GNU Autoconf 2.65 for m17n-lib 1.6.3.
#
# Report bugs to .
#
@@ -701,8 +701,8 @@
# Identity of this package.
PACKAGE_NAME='m17n-lib'
PACKAGE_TARNAME='m17n-lib'
-PACKAGE_VERSION='1.6.2'
-PACKAGE_STRING='m17n-lib 1.6.2'
+PACKAGE_VERSION='1.6.3'
+PACKAGE_STRING='m17n-lib 1.6.3'
PACKAGE_BUGREPORT='m17n-lib-bug@m17n.org'
PACKAGE_URL=''
@@ -1528,7 +1528,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures m17n-lib 1.6.2 to adapt to many kinds of systems.
+\`configure' configures m17n-lib 1.6.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1602,7 +1602,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of m17n-lib 1.6.2:";;
+ short | recursive ) echo "Configuration of m17n-lib 1.6.3:";;
esac
cat <<\_ACEOF
@@ -1738,7 +1738,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-m17n-lib configure 1.6.2
+m17n-lib configure 1.6.3
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2341,7 +2341,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by m17n-lib $as_me 1.6.2, which was
+It was created by m17n-lib $as_me 1.6.3, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -3154,7 +3154,7 @@
# Define the identity of the package.
PACKAGE='m17n-lib'
- VERSION='1.6.2'
+ VERSION='1.6.3'
cat >>confdefs.h <<_ACEOF
@@ -20132,7 +20132,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by m17n-lib $as_me 1.6.2, which was
+This file was extended by m17n-lib $as_me 1.6.3, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20198,7 +20198,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-m17n-lib config.status 1.6.2
+m17n-lib config.status 1.6.3
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/configure.ac new/m17n-lib-1.6.3/configure.ac
--- old/m17n-lib-1.6.2/configure.ac 2010-10-04 15:10:50.000000000 +0200
+++ new/m17n-lib-1.6.3/configure.ac 2011-09-12 06:32:59.000000000 +0200
@@ -1,6 +1,6 @@
dnl configure.ac -- autoconf script for the m17n library.
-dnl Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+dnl Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
dnl National Institute of Advanced Industrial Science and Technology (AIST)
dnl Registration Number H15PRO112
@@ -23,7 +23,7 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([m17n-lib],[1.6.2],[m17n-lib-bug@m17n.org])
+AC_INIT([m17n-lib],[1.6.3],[m17n-lib-bug@m17n.org])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/example/ChangeLog new/m17n-lib-1.6.3/example/ChangeLog
--- old/m17n-lib-1.6.2/example/ChangeLog 2010-10-05 02:26:04.000000000 +0200
+++ new/m17n-lib-1.6.3/example/ChangeLog 2011-10-11 02:36:40.000000000 +0200
@@ -1,3 +1,7 @@
+2011-10-11 Kenichi Handa
+
+ * Version 1.6.3 released.
+
2010-10-05 Kenichi Handa
* Version 1.6.2 released.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/m17n-core.pc.in new/m17n-lib-1.6.3/m17n-core.pc.in
--- old/m17n-lib-1.6.2/m17n-core.pc.in 2010-04-14 06:51:01.000000000 +0200
+++ new/m17n-lib-1.6.3/m17n-core.pc.in 2011-02-21 12:21:03.000000000 +0100
@@ -3,7 +3,7 @@
libdir=@libdir@
includedir=@includedir@
-moduledir=${exec_prefix}/lib/@M17N_MODULE_DIR@
+moduledir=${libdir}/@M17N_MODULE_DIR@
Name: m17n-core
Description: Core API suport of the m17n library.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/m17n-flt.pc.in new/m17n-lib-1.6.3/m17n-flt.pc.in
--- old/m17n-lib-1.6.2/m17n-flt.pc.in 2010-04-14 06:51:01.000000000 +0200
+++ new/m17n-lib-1.6.3/m17n-flt.pc.in 2011-02-21 12:21:03.000000000 +0100
@@ -4,7 +4,7 @@
includedir=@includedir@
version=@PACKAGE_VERSION@
-moduledir=${exec_prefix}/lib/@M17N_MODULE_DIR@
+moduledir=${libdir}/@M17N_MODULE_DIR@
Name: m17n-flt
Description: FLT API suport of the m17n library.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/m17n-gui.pc.in new/m17n-lib-1.6.3/m17n-gui.pc.in
--- old/m17n-lib-1.6.2/m17n-gui.pc.in 2010-04-14 06:51:01.000000000 +0200
+++ new/m17n-lib-1.6.3/m17n-gui.pc.in 2011-02-21 12:21:03.000000000 +0100
@@ -4,7 +4,7 @@
includedir=@includedir@
version=@PACKAGE_VERSION@
-moduledir=${exec_prefix}/lib/@M17N_MODULE_DIR@
+moduledir=${libdir}/@M17N_MODULE_DIR@
Name: m17n-gui
Description: GUI API suport of the m17n library.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/m17n-shell.pc.in new/m17n-lib-1.6.3/m17n-shell.pc.in
--- old/m17n-lib-1.6.2/m17n-shell.pc.in 2010-04-14 06:51:02.000000000 +0200
+++ new/m17n-lib-1.6.3/m17n-shell.pc.in 2011-02-21 12:21:03.000000000 +0100
@@ -4,7 +4,7 @@
includedir=@includedir@
version=@PACKAGE_VERSION@
-moduledir=${exec_prefix}/lib/@M17N_MODULE_DIR@
+moduledir=${libdir}/@M17N_MODULE_DIR@
Name: m17n-shell
Description: Shell API support of the m17n library.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/src/ChangeLog new/m17n-lib-1.6.3/src/ChangeLog
--- old/m17n-lib-1.6.2/src/ChangeLog 2010-10-04 07:42:23.000000000 +0200
+++ new/m17n-lib-1.6.3/src/ChangeLog 2011-10-11 02:36:29.000000000 +0200
@@ -1,3 +1,55 @@
+2011-10-11 Kenichi Handa
+
+ * Version 1.6.3 released.
+
+2011-09-12 Kenichi Handa
+
+ * draw.c (analyse_bidi_level): Adjust a type (FriBidiParType).
+
+2011-06-19 Kenichi Handa
+
+ * Makefile.am (libm17n_X_la_LIBADD): Add @FONTCONFIG_LD_FLAGS@.
+
+2011-03-09 Kenichi Handa
+
+ * input.c (take_action_list): Move the handling of candidate-list
+ change to the function filter.
+ (filter): Adjusted as above.
+
+2011-02-14 Kenichi Handa
+
+ * input.c (minput_list): Change the format of returning plist.
+
+2011-02-14 Kenichi Handa
+
+ * m17n.h (minput_list): Extern it.
+
+ * input.c (MIMExternalModule): New member 'name'.
+ (load_external_module): Return value changed.
+ (unload_external_module): New function.
+ (fini_im_info): Use unload_external_module.
+ (load_im_info): Adjuted for the change of load_external_module.
+ (minput_list): New function.
+
+2011-01-06 Kenichi Handa
+
+ * coding.c: Fix comment syntax for doxygen.
+
+2010-12-13 Kenichi Handa
+
+ * m17n-flt.c (mflt_enable_new_feature): Document it.
+
+ * m17n-flt.h: Exclude extern variables from Doxygen's scope.
+
+2010-12-10 Kenichi Handa
+
+ * m17n-flt.c (mflt_dump_gstring): Document it.
+
+2010-11-05 Kenichi Handa
+
+ * locale.c (make_locale): Don't call setlocale. Just parse the
+ arg NAME.
+
2010-10-04 Kenichi Handa
* Version 1.6.2 released.
@@ -4963,7 +5015,7 @@
* Version 1.0 released.
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H15PRO112
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/src/Makefile.am new/m17n-lib-1.6.3/src/Makefile.am
--- old/m17n-lib-1.6.2/src/Makefile.am 2010-04-14 06:51:06.000000000 +0200
+++ new/m17n-lib-1.6.3/src/Makefile.am 2011-09-12 02:42:48.000000000 +0200
@@ -90,7 +90,7 @@
X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
libm17n_X_la_SOURCES = m17n-X.h m17n-X.c
-libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
+libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ @FONTCONFIG_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
libm17n_X_la_LDFLAGS = -avoid-version -module
libm17n_gd_la_SOURCES = m17n-gd.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/src/Makefile.in new/m17n-lib-1.6.3/src/Makefile.in
--- old/m17n-lib-1.6.2/src/Makefile.in 2010-10-05 02:19:54.000000000 +0200
+++ new/m17n-lib-1.6.3/src/Makefile.in 2011-09-12 06:43:43.000000000 +0200
@@ -488,7 +488,7 @@
@WITH_GUI_TRUE@module_LTLIBRARIES = libm17n-X.la libm17n-gd.la
@WITH_GUI_TRUE@X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
@WITH_GUI_TRUE@libm17n_X_la_SOURCES = m17n-X.h m17n-X.c
-@WITH_GUI_TRUE@libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
+@WITH_GUI_TRUE@libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ @FONTCONFIG_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
@WITH_GUI_TRUE@libm17n_X_la_LDFLAGS = -avoid-version -module
@WITH_GUI_TRUE@libm17n_gd_la_SOURCES = m17n-gd.c
@WITH_GUI_TRUE@libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ @FREETYPE_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/src/coding.c new/m17n-lib-1.6.3/src/coding.c
--- old/m17n-lib-1.6.2/src/coding.c 2010-09-11 02:59:31.000000000 +0200
+++ new/m17n-lib-1.6.3/src/coding.c 2011-01-06 03:27:08.000000000 +0100
@@ -190,9 +190,9 @@
Unget �ѥХåե� */
MText *unread;
- /*en
+ /**en
Working area. */
- /*ja
+ /**ja
����ΰ� */
MText *work_mt;
@@ -3090,6 +3090,7 @@
/*** @} */
#endif /* !FOR_DOXYGEN || DOXYGEN_INTERNAL_MODULE */
+
/* External API */
@@ -3391,7 +3392,6 @@
MSymbol Mcoding;
/*=*/
/*** @} */
-/*=*/
/***en
@brief Define a coding system.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/src/draw.c new/m17n-lib-1.6.3/src/draw.c
--- old/m17n-lib-1.6.2/src/draw.c 2010-09-02 08:51:22.000000000 +0200
+++ new/m17n-lib-1.6.3/src/draw.c 2011-09-12 07:19:18.000000000 +0200
@@ -109,7 +109,7 @@
MGlyph *g;
int i;
#ifdef HAVE_FRIBIDI
- FriBidiCharType base = bidi_sensitive ? FRIBIDI_TYPE_RTL : FRIBIDI_TYPE_LTR;
+ FriBidiParType base = bidi_sensitive ? FRIBIDI_TYPE_RTL : FRIBIDI_TYPE_LTR;
FriBidiChar *logical = alloca (sizeof (FriBidiChar) * len);
FriBidiLevel *levels;
FriBidiStrIndex *indices;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/src/input.c new/m17n-lib-1.6.3/src/input.c
--- old/m17n-lib-1.6.2/src/input.c 2010-09-30 13:08:07.000000000 +0200
+++ new/m17n-lib-1.6.3/src/input.c 2011-03-09 06:35:23.000000000 +0100
@@ -1,5 +1,5 @@
/* input.c -- input method module.
- Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)
Registration Number H15PRO112
@@ -220,6 +220,7 @@
typedef struct
{
+ MSymbol name;
void *handle;
MPlist *func_list; /* function name vs (MIMExternalFunc *) */
} MIMExternalModule;
@@ -1200,13 +1201,17 @@
return 0;
}
-/* Load an external module from PLIST into IM_INFO->externals.
+/* Load an external module from PLIST, and return a pointer to
+ MIMExternalModule.
+
PLIST has this form:
PLIST ::= ( MODULE-NAME FUNCTION * )
- IM_INFO->externals is a plist of MODULE-NAME vs (MIMExternalModule *). */
+ IM_INFO->externals is a plist of MODULE-NAME vs (MIMExternalModule *).
-static int
-load_external_module (MInputMethodInfo *im_info, MPlist *plist)
+ On error, return NULL. */
+
+static MIMExternalModule *
+load_external_module (MPlist *plist)
{
void *handle;
MSymbol module;
@@ -1227,10 +1232,7 @@
handle = dlopen (module_file, RTLD_NOW);
if (MFAILP (handle))
- {
- fprintf (stderr, "%s\n", dlerror ());
- return -1;
- }
+ return NULL;
func_list = mplist ();
MPLIST_DO (plist, MPLIST_NEXT (plist))
{
@@ -1243,15 +1245,23 @@
}
MSTRUCT_MALLOC (external, MERROR_IM);
+ external->name = module;
external->handle = handle;
external->func_list = func_list;
- mplist_add (im_info->externals, module, external);
- return 0;
+ return external;
err_label:
- dlclose (handle);
M17N_OBJECT_UNREF (func_list);
- return -1;
+ dlclose (handle);
+ return NULL;
+}
+
+static void
+unload_external_module (MIMExternalModule *external)
+{
+ dlclose (external->handle);
+ M17N_OBJECT_UNREF (external->func_list);
+ free (external);
}
static void
@@ -1380,11 +1390,7 @@
{
MPLIST_DO (plist, im_info->externals)
{
- MIMExternalModule *external = MPLIST_VAL (plist);
-
- dlclose (external->handle);
- M17N_OBJECT_UNREF (external->func_list);
- free (external);
+ unload_external_module (MPLIST_VAL (plist));
MPLIST_KEY (plist) = Mt;
}
M17N_OBJECT_UNREF (im_info->externals);
@@ -1566,7 +1572,7 @@
}
-/* Return an IM_INFO for the an method specified by LANGUAGE, NAME,
+/* Return an IM_INFO for the input method specified by LANGUAGE, NAME,
and EXTRA. KEY, if not Mnil, tells which kind of information about
the input method is necessary, and the returned IM_INFO may contain
only that information. */
@@ -2290,9 +2296,13 @@
im_info->externals = mplist ();
MPLIST_DO (elt, MPLIST_NEXT (elt))
{
+ MIMExternalModule *external;
+
if (MFAILP (MPLIST_PLIST_P (elt)))
continue;
- load_external_module (im_info, MPLIST_PLIST (elt));
+ external = load_external_module (MPLIST_PLIST (elt));
+ if (external)
+ mplist_add (im_info->externals, external->name, external);
}
}
else if (key == Mstate)
@@ -2994,9 +3004,6 @@
take_action_list (MInputContext *ic, MPlist *action_list)
{
MInputContextInfo *ic_info = (MInputContextInfo *) ic->info;
- MPlist *candidate_list = ic->candidate_list;
- int candidate_index = ic->candidate_index;
- int candidate_show = ic->candidate_show;
MTextProperty *prop;
MPLIST_DO (action_list, action_list)
@@ -3470,31 +3477,6 @@
};
}
}
-
- if (ic->candidate_list)
- {
- M17N_OBJECT_UNREF (ic->candidate_list);
- ic->candidate_list = NULL;
- }
- if (ic->cursor_pos > 0
- && (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1,
- Mcandidate_list)))
- {
- ic->candidate_list = mtext_property_value (prop);
- M17N_OBJECT_REF (ic->candidate_list);
- ic->candidate_index
- = (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1,
- Mcandidate_index);
- ic->candidate_from = mtext_property_start (prop);
- ic->candidate_to = mtext_property_end (prop);
- }
-
- if (candidate_list != ic->candidate_list)
- ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED;
- if (candidate_index != ic->candidate_index)
- ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED;
- if (candidate_show != ic->candidate_show)
- ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED;
return 0;
}
@@ -3904,7 +3886,37 @@
ic_info->key_unhandled = 0;
do {
- if (handle_key (ic) < 0)
+ MPlist *candidate_list = ic->candidate_list;
+ int candidate_index = ic->candidate_index;
+ int candidate_show = ic->candidate_show;
+ MTextProperty *prop;
+ int result = handle_key (ic);
+
+ if (ic->candidate_list)
+ {
+ M17N_OBJECT_UNREF (ic->candidate_list);
+ ic->candidate_list = NULL;
+ }
+ if (ic->cursor_pos > 0
+ && (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1,
+ Mcandidate_list)))
+ {
+ ic->candidate_list = mtext_property_value (prop);
+ M17N_OBJECT_REF (ic->candidate_list);
+ ic->candidate_index
+ = (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1,
+ Mcandidate_index);
+ ic->candidate_from = mtext_property_start (prop);
+ ic->candidate_to = mtext_property_end (prop);
+ }
+ if (candidate_list != ic->candidate_list)
+ ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED;
+ if (candidate_index != ic->candidate_index)
+ ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED;
+ if (candidate_show != ic->candidate_show)
+ ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED;
+
+ if (result < 0)
{
/* KEY was not handled. Delete it from the current key sequence. */
if (ic_info->used > 0)
@@ -5923,6 +5935,153 @@
return (ret < 0 ? -1 : 1);
}
+/***en
+ @brief List available input methods.
+
+ The minput_list () function returns a list of currently available
+ input methods whose language is $LANGUAGE. If $LANGUAGE is #Mnil,
+ all input methods are listed.
+
+ @return
+ The returned value is a plist of this form:
+ ((LANGUAGE-NAME INPUT-METHOD-NAME SANE) ...)
+ The third element SANE of each input method is #Mt if it can be
+ successfully used, or #Mnil if it has some problem (e.g. syntax
+ error of MIM file, unavailable external module, unavailable
+ including input method). */
+
+#if EXAMPLE_CODE
+#include
+#include
+#include
+
+int
+main (int argc, char **argv)
+{
+ MPlist *imlist, *pl;
+
+ M17N_INIT ();
+ imlist = minput_list ((argc > 1) ? msymbol (argv[1]) : Mnil);
+ for (pl = imlist; mplist_key (pl) != Mnil; pl = mplist_next (pl))
+ {
+ MPlist *p = mplist_value (pl);
+ MSymbol lang, name, sane;
+
+ lang = mplist_value (p);
+ p = mplist_next (p);
+ name = mplist_value (p);
+ p = mplist_next (p);
+ sane = mplist_value (p);
+
+ printf ("%s %s %s\n", msymbol_name (lang), msymbol_name (name),
+ sane == Mt ? "ok" : "no");
+ }
+
+ m17n_object_unref (imlist);
+ M17N_FINI ();
+ exit (0);
+}
+#endif
+
+MPlist *
+minput_list (MSymbol language)
+{
+ MPlist *plist, *pl;
+ MPlist *imlist = mplist ();
+
+ MINPUT__INIT ();
+ plist = mdatabase_list (Minput_method, language, Mnil, Mnil);
+ if (! plist)
+ return imlist;
+ MPLIST_DO (pl, plist)
+ {
+ MDatabase *mdb = MPLIST_VAL (pl);
+ MSymbol *tag = mdatabase_tag (mdb);
+ MPlist *imdata, *p, *elm;
+ int num_maps = 0, num_states = 0;
+
+ if (tag[2] == Mnil)
+ continue;
+ imdata = mdatabase_load (mdb);
+ if (! imdata)
+ continue;
+ MPLIST_DO (p, imdata)
+ if (MPLIST_PLIST_P (p))
+ {
+ /* Check these basic functionarity:
+ All external modules (if any) are loadable.
+ All included input method (if any) are loadable.
+ At least one map is defined or included.
+ At least one state is defined or included. */
+ MPlist *elt = MPLIST_PLIST (p);
+ MSymbol key;
+
+ if (MFAILP (MPLIST_SYMBOL_P (elt)))
+ break;
+ key = MPLIST_SYMBOL (elt);
+ if (key == Mmap)
+ num_maps++;
+ else if (key == Mstate)
+ num_states++;
+ else if (key == Mmodule)
+ {
+ MPLIST_DO (elt, MPLIST_NEXT (elt))
+ {
+ MIMExternalModule *external;
+
+ if (MFAILP (MPLIST_PLIST_P (elt)))
+ break;
+ external = load_external_module (MPLIST_PLIST (elt));
+ if (MFAILP (external))
+ break;
+ unload_external_module (external);
+ }
+ if (! MPLIST_TAIL_P (elt))
+ break;
+ }
+ else if (key == Minclude)
+ {
+ MInputMethodInfo *im_info;
+
+ elt = MPLIST_NEXT (elt);
+ if (MFAILP (MPLIST_PLIST_P (elt)))
+ break;
+ im_info = get_im_info_by_tags (MPLIST_PLIST (elt));
+ if (MFAILP (im_info))
+ break;
+ elt = MPLIST_NEXT (elt);
+ if (MFAILP (MPLIST_SYMBOL_P (elt)))
+ break;
+ key = MPLIST_SYMBOL (elt);
+ if (key == Mmap)
+ {
+ if (! im_info->maps)
+ break;
+ num_maps++;
+ }
+ else if (key == Mstate)
+ {
+ if (! im_info->states)
+ break;
+ num_states++;
+ }
+ }
+ }
+ elm = mplist ();
+ mplist_add (elm, Msymbol, tag[1]);
+ mplist_add (elm, Msymbol, tag[2]);
+ if (MPLIST_TAIL_P (p) && num_maps > 0 && num_states > 0)
+ mplist_add (elm, Msymbol, Mt);
+ else
+ mplist_add (elm, Msymbol, Mnil);
+ mplist_push (imlist, Mplist, elm);
+ M17N_OBJECT_UNREF (elm);
+ M17N_OBJECT_UNREF (imdata);
+ }
+ M17N_OBJECT_UNREF (plist);
+ return imlist;
+}
+
/*=*/
/*** @} */
/*=*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/src/locale.c new/m17n-lib-1.6.3/src/locale.c
--- old/m17n-lib-1.6.2/src/locale.c 2010-04-14 06:51:04.000000000 +0200
+++ new/m17n-lib-1.6.3/src/locale.c 2010-11-05 12:18:09.000000000 +0100
@@ -86,34 +86,24 @@
MLocale *mlocale_monetary, *mlocale_numeric, ;
#endif
-/** Parse locale name NAME and return a newly created MLocale object.
- If the locale is not supported by the system, return NULL. */
+/** Parse locale name NAME and return a newly created MLocale object. */
static MLocale *
make_locale (const char *name)
{
- char *current, *new, *str;
+ char *str;
int len;
MLocale *locale;
char c;
- str = setlocale (LC_CTYPE, NULL);
- len = strlen (str) + 1;
- current = alloca (len);
- memcpy (current, str, len);
-
- if (! (new = setlocale (LC_CTYPE, name)))
- return NULL;
-
-
M17N_OBJECT (locale, NULL, MERROR_LOCALE);
- locale->name = msymbol (new);
+ locale->name = msymbol (name);
msymbol_put (locale->name, M_locale, (void *) locale);
M17N_OBJECT_UNREF (locale);
- len = strlen (new) + 1;
+ len = strlen (name) + 1;
str = alloca (len);
- memcpy (str, new, len);
+ memcpy (str, name, len);
c = '\0';
while (1)
@@ -162,8 +152,6 @@
}
else
locale->coding = Mcoding_us_ascii;
-
- setlocale (LC_CTYPE, current);
return locale;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/src/m17n-flt.c new/m17n-lib-1.6.3/src/m17n-flt.c
--- old/m17n-lib-1.6.2/src/m17n-flt.c 2010-09-17 03:29:17.000000000 +0200
+++ new/m17n-lib-1.6.3/src/m17n-flt.c 2010-12-13 06:24:57.000000000 +0100
@@ -3107,6 +3107,13 @@
return to;
}
+/***en
+ @brief Flag to control several new OTF handling commands.
+
+ If the variable mflt_enable_new_feature is nonzero, the function
+ #mflt_run () can drive a Font Layout Table that contains the new
+ OTF-related commands ":otf?" and/or OTF feature specification in a
+ category table. */
int mflt_enable_new_feature;
int (*mflt_iterate_otf_feature) (struct _MFLTFont *font,
@@ -3226,6 +3233,13 @@
return flt;
}
+/***en
+ @brief Dump an MFLTGlyphString.
+
+ The mflt_dump_gstring () function prints the glyph sequence
+ $GSTRING in a human readable way to the stderr or to what
+ specified by the environment variable MDEBUG_OUTPUT_FILE. */
+
void
mflt_dump_gstring (MFLTGlyphString *gstring)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/src/m17n-flt.h new/m17n-lib-1.6.3/src/m17n-flt.h
--- old/m17n-lib-1.6.2/src/m17n-flt.h 2010-09-16 10:14:45.000000000 +0200
+++ new/m17n-lib-1.6.3/src/m17n-flt.h 2010-12-13 06:33:16.000000000 +0100
@@ -425,6 +425,9 @@
extern int mflt_run (MFLTGlyphString *gstring, int from, int to,
MFLTFont *font, MFLT *flt);
+/*=*/
+/*** @} */
+
extern int mflt_enable_new_feature;
extern MSymbol (*mflt_font_id) (MFLTFont *font);
@@ -437,9 +440,6 @@
extern int (*mflt_try_otf) (struct _MFLTFont *font, MFLTOtfSpec *spec,
MFLTGlyphString *gstring, int from, int to);
-/*=*/
-/*** @} */
-
M17N_END_HEADER
#endif /* _M17N_FLT_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/m17n-lib-1.6.2/src/m17n.h new/m17n-lib-1.6.3/src/m17n.h
--- old/m17n-lib-1.6.2/src/m17n.h 2010-09-21 06:04:33.000000000 +0200
+++ new/m17n-lib-1.6.3/src/m17n.h 2011-02-14 00:36:03.000000000 +0100
@@ -1389,6 +1389,8 @@
extern int minput_set_variable (MSymbol language, MSymbol name,
MSymbol variable, void *value);
+extern MPlist *minput_list (MSymbol lang);
+
extern MInputMethod *mdebug_dump_im (MInputMethod *im, int indent);
M17N_END_HEADER
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
