SCIM obsolete S11 B174. 7082699 SCIM component packages are needed to obsolete from S11
--- a/specs/build-im.sh Sat Aug 27 02:29:59 2011 +0900
+++ b/specs/build-im.sh Sat Aug 27 04:34:21 2011 +0900
@@ -77,17 +77,13 @@
M17NSPECS="m17n-lib-core.spec m17n-db.spec m17n-im-config.spec"
M17NSPECS="$M17NSPECS m17n-contrib.spec"
- SCIMSPECS="scim.spec scim-anthy.spec scim-hangul.spec scim-chewing.spec"
- SCIMSPECS="$SCIMSPECS scim-thai.spec scim-bridge.spec scim-tables.spec"
- SCIMSPECS="$SCIMSPECS scim-pinyin.spec scim-sunpinyin.spec scim-m17n.spec"
-
IBUSSPECS="gob2.spec ibus.spec ibus-anthy.spec ibus-m17n.spec"
IBUSSPECS="$IBUSSPECS ibus-chewing.spec ibus-pinyin.spec ibus-hangul.spec"
IBUSSPECS="$IBUSSPECS ibus-sunpinyin.spec ibus-table.spec"
IBUSSPECS="$IBUSSPECS ibus-table-extraphrase.spec ibus-table-data.spec"
IBUSSPECS="$IBUSSPECS ibus-xkbc.spec ibus-sayura.spec imf-selector.spec"
- SPECFILES="$LIBSPECS $IIIMSPECS $M17NSPECS $SCIMSPECS $IBUSSPECS"
+ SPECFILES="$LIBSPECS $IIIMSPECS $M17NSPECS $IBUSSPECS"
else
SPECFILES=$@
--- a/specs/ext-sources/scim-anthy.copyright Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
-is applied is otherwise unspecified.
-
---------------------------------------------------------------------
-
-Copyright (C) 2004 Hiroyuki Ikezoe
-Copyright (C) 2004-2005 Takuro Ashie <[email protected]>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-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.
--- a/specs/ext-sources/scim-bridge.copyright Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-This package of scim-bridge is released under the dual license
-of GPL 2 and LGPL 2.1.
-
---------------------------------------------------------------------
-
-Copyright (C) 2006 by Ryo Dairiki <[email protected]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation and
-appearing in the file LICENSE.LGPL included in the package of this file.
-You can also redistribute it and/or modify it under the terms of
-the GNU General Public License as published by the Free Software Foundation and
-appearing in the file LICENSE.GPL included in the package of this file.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--- a/specs/ext-sources/scim-chewing.copyright Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Copyright(c) 2004, Kanru Chen <[email protected]>
- Jim Huang <[email protected]>
-
-This package is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 dated June, 1991.
-
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this package; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
--- a/specs/ext-sources/scim-hangul.copyright Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
-is applied is otherwise unspecified.
-
---------------------------------------------------------------------
-
-Copyright (C) 2002-2004, James Su
-Copyright (C) 2004-2006, CHOE Hwanjin
-Copyright (C) 2003-2005, Cougar Liu
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-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.
--- a/specs/ext-sources/scim-m17n.copyright Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
-is applied is otherwise unspecified.
-
---------------------------------------------------------------------
-
-Copyright (c) 2004 James Su <[email protected]>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
-USA.
-
--- a/specs/ext-sources/scim-pinyin.copyright Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-Copyright 2002-2004, James Su <[email protected]>
-
-This package is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 dated June, 1991.
-
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this package; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
-USA.
--- a/specs/ext-sources/scim-tables.copyright Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
-is applied is otherwise unspecified.
-
---------------------------------------------------------------------
-
-The scim-tables package is distributed under GNU GPL. The
-Nippon input method table included in this source package (and the
-scim-tables-ja binary package) is derived from the KANJIDIC data files
-maintained by Jim Breen <[email protected]>, and this derivative
-work got the explicit permission from the maintainer. For the licensing
-detail of KANJIDIC data files (note we don't distribute these files, we
-only distribute derivative work base on it), see its license in
-/usr/share/doc/scim-tables-ja/kanjidic_licence.html.
-
-Copyright 2002-2005, James Su <[email protected]>
- Cougar Liu <[email protected]>
- Mike FABIAN <[email protected]>
- Joerg Haustein <[email protected]>
- Mohammad DAMT <[email protected]>
- Amanpreet Singh Brar <[email protected]>
- Jatin Nansi <[email protected]>
- Jens Petersen <[email protected]>
- Matthew Fischer <[email protected]>
- Suyash Shrestha <[email protected]>
- H Parimala and R Hariram Aatreya
- Samuel Thibault <[email protected]>
- Albert Wang <[email protected]>
- Roy Hiu-yeung Chan <[email protected]>
- Woodman Tuen <[email protected]>
- npwjm <[email protected]>
- Zen XioCiun and others
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
--- a/specs/ext-sources/scim-thai.copyright Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the General Public License version 2 (GPLv2) at this time
-for any software where a choice of GPL license versions is made
-available with the language indicating that GPLv2 or any later
-version may be used, or where a choice of which version of the GPL
-is applied is otherwise unspecified.
-
---------------------------------------------------------------------
-
-Copyright: (C) 2006 Theppitak Karoonboonyanan <[email protected]>.
-
-This package is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this package; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--- a/specs/ext-sources/scim-xinput Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-# Used in IMselect
-ID="SCIM"
-
-show_desc(){
- print "SCIM - Smart Common Input Method"
-}
-
-show_prior(){
- lang=$1
- case $lang in
- *) break;;
- esac
-}
-
-case "X$1" in
- 'X-id') echo "$ID" ; exit 0;;
- 'X-desc') show_desc; exit 0;;
- 'X-prior') show_prior $2; exit 0;;
-esac
-
-if [ -x /usr/bin/scim ]; then
- GTK_IM_MODULE='scim'
- export GTK_IM_MODULE
- XMODIFIERS='@im=SCIM'
- export XMODIFIERS
-
- XIM_PRG=/usr/bin/scim
- XIM_OPT=-d
-fi
--- a/specs/ext-sources/scim.copyright Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-For the avoidance of doubt, except that if any license choice other
-than GPL or LGPL is available it will apply instead, Sun elects to
-use only the Lesser General Public License version 2.1 (LGPLv2) at
-this time for any software where a choice of LGPL license versions
-is made available with the language indicating that LGPLv2.1 or any
-later version may be used, or where a choice of which version of the
-LGPL is applied is otherwise unspecified.
-
---------------------------------------------------------------------
-
-Copyright (C) 2002-2005 James Su <[email protected]>
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
--- a/specs/patches/scim-1.4.6-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,332 +0,0 @@
-Index: Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim/Makefile.am,v
-retrieving revision 1.22
-diff -u -p -r1.22 Makefile.am
---- Makefile.am 6 Dec 2005 10:14:49 -0000 1.22
-+++ Makefile.am 30 Apr 2007 03:52:13 -0000
-@@ -33,7 +33,7 @@ EXTRA_DIST = config.rpath THANKS \
- intltool-update.in
-
- AUTOMAKE_OPTIONS = gnu
--SUBDIRS = m4 intl src utils modules configs docs po extras data tests
-+SUBDIRS = src utils modules configs docs po extras data tests
-
- MAINTAINERCLEANFILES = Makefile.in \
- aclocal.m4 \
-@@ -61,7 +61,7 @@ pkgconfig_DATA = scim.pc \
- $(GTK_UTILS_PKGCONFIG) \
- $(X11_UTILS_PKGCONFIG)
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-
- .PHONY: update-ChangeLog
-
-Index: bootstrap
-===================================================================
-RCS file: /cvsroot/scim/scim/bootstrap,v
-retrieving revision 1.7
-diff -u -p -r1.7 bootstrap
---- bootstrap 7 Mar 2005 04:25:24 -0000 1.7
-+++ bootstrap 30 Apr 2007 03:52:13 -0000
-@@ -20,7 +20,7 @@
- #! /bin/sh
-
- set -x
--aclocal -I m4
-+aclocal
- autoheader
- libtoolize -c --automake
- automake --add-missing --copy --include-deps
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/scim/scim/configure.ac,v
-retrieving revision 1.148.2.9
-diff -u -p -r1.148.2.9 configure.ac
---- configure.ac 22 Apr 2007 06:29:43 -0000 1.148.2.9
-+++ configure.ac 30 Apr 2007 03:52:14 -0000
-@@ -66,7 +66,9 @@ AM_CONFIG_HEADER([config.h])
-
- # Init gettext
- ALL_LINGUAS="zh_CN zh_TW ja ko de fr it cs pa fi sv nl"
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+LTLIBINTL=
-+AC_SUBST(LTLIBINTL)
-
- # Init libtool
- AC_LIBTOOL_DLOPEN
-Index: extras/gtk2_immodule/Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim/extras/gtk2_immodule/Makefile.am,v
-retrieving revision 1.27.2.1
-diff -u -p -r1.27.2.1 Makefile.am
---- extras/gtk2_immodule/Makefile.am 10 Apr 2007 09:14:31 -0000 1.27.2.1
-+++ extras/gtk2_immodule/Makefile.am 30 Apr 2007 03:52:14 -0000
-@@ -38,13 +38,13 @@ module_LTLIBRARIES = $(CONFIG_GTK2_IMMOD
-
- im_scim_la_SOURCES = gtkimcontextscim.cpp imscim.cpp
-
--im_scim_la_CXXFLAGS=@GTK2_CFLAGS@
-+im_scim_la_CXXFLAGS=@GTK2_CFLAGS@ \
-+ -instlib=$(top_builddir)/src/.libs/libscim-1.0.so
- im_scim_la_CFLAGS =@GTK2_CFLAGS@
-
- im_scim_la_LDFLAGS = -rpath $(moduledir) \
- -avoid-version \
- -module \
-- -lstdc++ \
- $(LD_VERSION_SCRIPT_OPTION) \
- @GTK2_LIBS@
-
-Index: extras/setup/Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim/extras/setup/Makefile.am,v
-retrieving revision 1.12.2.1
-diff -u -p -r1.12.2.1 Makefile.am
---- extras/setup/Makefile.am 10 Apr 2007 09:14:31 -0000 1.12.2.1
-+++ extras/setup/Makefile.am 30 Apr 2007 03:52:14 -0000
-@@ -55,7 +55,6 @@ setup_la_CXXFLAGS = @GTK2_CFLAGS@
- setup_la_LDFLAGS = -avoid-version \
- -rpath $(moduledir) \
- -module \
-- -lstdc++ \
- @LIBTOOL_EXPORT_OPTIONS@ \
- @GTK2_LIBS@ \
- @LTLIBINTL@
-Index: modules/FrontEnd/scim_x11_frontend.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim/modules/FrontEnd/scim_x11_frontend.cpp,v
-retrieving revision 1.179.2.4
-diff -u -p -r1.179.2.4 scim_x11_frontend.cpp
---- modules/FrontEnd/scim_x11_frontend.cpp 11 Apr 2007 06:10:42 -0000 1.179.2.4
-+++ modules/FrontEnd/scim_x11_frontend.cpp 30 Apr 2007 03:52:15 -0000
-@@ -46,6 +46,7 @@
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
- #include <X11/Xutil.h>
-+#include <locale.h>
- #include "IMdkit/IMdkit.h"
- #include "IMdkit/Xi18n.h"
-
-Index: src/Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim/src/Makefile.am,v
-retrieving revision 1.55.2.1
-diff -u -p -r1.55.2.1 Makefile.am
---- src/Makefile.am 10 Apr 2007 09:14:31 -0000 1.55.2.1
-+++ src/Makefile.am 30 Apr 2007 03:52:16 -0000
-@@ -134,8 +134,7 @@ libscim@SCIM_EPOCH@_la_LDFLAGS= -version
- $(LD_VERSION_SCRIPT_OPTION) \
- @LIBTOOL_EXPORT_OPTIONS@ \
- @LIBICONV@ \
-- @LTLIBINTL@ \
-- -lstdc++
-+ @LTLIBINTL@
-
- libscim@SCIM_EPOCH@_la_LIBADD = libltdlc.la
-
-Index: src/ltdl.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim/src/ltdl.cpp,v
-retrieving revision 1.2
-diff -u -p -r1.2 ltdl.cpp
---- src/ltdl.cpp 13 Aug 2004 00:02:39 -0000 1.2
-+++ src/ltdl.cpp 30 Apr 2007 03:52:17 -0000
-@@ -3372,7 +3372,7 @@ lt_dlopenext (
- assert (filename);
-
- len = LT_STRLEN (filename);
-- ext = strrchr (filename, '.');
-+ ext = strrchr ((char*)filename, '.');
-
- /* If FILENAME already bears a suitable extension, there is no need
- to try appending additional extensions. */
-Index: src/scim.h
-===================================================================
-RCS file: /cvsroot/scim/scim/src/scim.h,v
-retrieving revision 1.38
-diff -u -p -r1.38 scim.h
---- src/scim.h 17 May 2005 06:45:14 -0000 1.38
-+++ src/scim.h 30 Apr 2007 03:52:17 -0000
-@@ -298,14 +298,14 @@
- #include <scim_global_config.h>
- #endif
-
--#ifdef Uses_SCIM_OBJECT
-- #include <scim_object.h>
--#endif
--
- #ifdef Uses_SCIM_POINTER
- #include <scim_pointer.h>
- #endif
-
-+#ifdef Uses_SCIM_OBJECT
-+ #include <scim_object.h>
-+#endif
-+
- #ifdef Uses_SCIM_SLOT
- #include <scim_slot.h>
- #endif
-Index: src/scim_pointer.h
-===================================================================
-RCS file: /cvsroot/scim/scim/src/scim_pointer.h,v
-retrieving revision 1.11
-diff -u -p -r1.11 scim_pointer.h
---- src/scim_pointer.h 10 Jan 2005 08:30:54 -0000 1.11
-+++ src/scim_pointer.h 30 Apr 2007 03:52:17 -0000
-@@ -84,7 +84,7 @@ public:
- //!<
- //!< <BR>Initialize a new Pointer with any dumb pointer.
-
-- Pointer(Pointer& src) : t(0)
-+ Pointer(const Pointer& src) : t(0)
- {
- set(src.get());
- }
-Index: src/scim_slot.h
-===================================================================
-RCS file: /cvsroot/scim/scim/src/scim_slot.h,v
-retrieving revision 1.8
-diff -u -p -r1.8 scim_slot.h
---- src/scim_slot.h 10 Jan 2005 08:30:54 -0000 1.8
-+++ src/scim_slot.h 30 Apr 2007 03:52:18 -0000
-@@ -149,7 +149,7 @@ public:
-
- template <typename T1, typename T2, typename R>
- inline Slot0<R>*
--slot(T1* &object, R (T2::*function)())
-+slot(T1* object, R (T2::*function)())
- {
- return new MethodSlot0<T2, R>(object, function);
- }
-@@ -291,7 +291,7 @@ public:
-
- template <typename T1, typename T2, typename R, typename P1>
- inline Slot1<R, P1>*
--slot(T1* &object, R (T2::*function)(P1))
-+slot(T1* object, R (T2::*function)(P1))
- {
- return new MethodSlot1<T2, R, P1>(object, function);
- }
-@@ -434,7 +434,7 @@ public:
-
- template <typename T1, typename T2, typename R, typename P1, typename P2>
- inline Slot2<R, P1, P2>*
--slot(T1* &object, R (T2::*function)(P1, P2))
-+slot(T1* object, R (T2::*function)(P1, P2))
- {
- return new MethodSlot2<T2, R, P1, P2>(object, function);
- }
-@@ -577,7 +577,7 @@ public:
-
- template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3>
- inline Slot3<R, P1, P2, P3>*
--slot(T1* &object, R (T2::*function)(P1, P2, P3))
-+slot(T1* object, R (T2::*function)(P1, P2, P3))
- {
- return new MethodSlot3<T2, R, P1, P2, P3>(object, function);
- }
-@@ -720,7 +720,7 @@ public:
-
- template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3, typename P4>
- inline Slot4<R, P1, P2, P3, P4>*
--slot(T1* &object, R (T2::*function)(P1, P2, P3, P4))
-+slot(T1* object, R (T2::*function)(P1, P2, P3, P4))
- {
- return new MethodSlot4<T2, R, P1, P2, P3, P4>(object, function);
- }
-@@ -862,7 +862,7 @@ public:
-
- template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3, typename P4, typename P5>
- inline Slot5<R, P1, P2, P3, P4, P5>*
--slot(T1* &object, R (T2::*function)(P1, P2, P3, P4, P5))
-+slot(T1* object, R (T2::*function)(P1, P2, P3, P4, P5))
- {
- return new MethodSlot5<T2, R, P1, P2, P3, P4, P5>(object, function);
- }
-@@ -1005,7 +1005,7 @@ public:
-
- template <typename T1, typename T2, typename R, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
- inline Slot6<R, P1, P2, P3, P4, P5, P6>*
--slot(T1* &object, R (T2::*function)(P1, P2, P3, P4, P5, P6))
-+slot(T1* object, R (T2::*function)(P1, P2, P3, P4, P5, P6))
- {
- return new MethodSlot6<T2, R, P1, P2, P3, P4, P5, P6>(object, function);
- }
-Index: src/scim_socket.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim/src/scim_socket.cpp,v
-retrieving revision 1.44
-diff -u -p -r1.44 scim_socket.cpp
---- src/scim_socket.cpp 1 Dec 2005 08:27:36 -0000 1.44
-+++ src/scim_socket.cpp 30 Apr 2007 03:52:19 -0000
-@@ -46,6 +46,10 @@
- #include <errno.h>
- #include <signal.h>
-
-+#if defined(sun) && !defined(SUN_LEN)
-+#define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
-+#endif
-+
- #include "scim_private.h"
- #include "scim.h"
-
-Index: src/scim_transaction.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim/src/scim_transaction.cpp,v
-retrieving revision 1.13.2.1
-diff -u -p -r1.13.2.1 scim_transaction.cpp
---- src/scim_transaction.cpp 7 Jun 2006 09:27:57 -0000 1.13.2.1
-+++ src/scim_transaction.cpp 30 Apr 2007 03:52:19 -0000
-@@ -791,7 +791,8 @@ TransactionReader::get_data (String &str
- }
-
- if (len)
-- str = String (m_impl->m_holder->m_buffer + m_impl->m_read_pos, m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
-+ str = String ((const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos),
-+ (const char*)m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
- else
- str = String ("");
-
-@@ -827,7 +828,8 @@ TransactionReader::get_data (WideString
- }
-
- if (len)
-- mbs = String (m_impl->m_holder->m_buffer + m_impl->m_read_pos, m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
-+ mbs = String ((const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos),
-+ (const char*)m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
- else
- mbs = String ("");
-
-Index: src/scim_utility.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim/src/scim_utility.cpp,v
-retrieving revision 1.48.2.5
-diff -u -p -r1.48.2.5 scim_utility.cpp
---- src/scim_utility.cpp 2 Nov 2006 04:11:51 -0000 1.48.2.5
-+++ src/scim_utility.cpp 30 Apr 2007 03:52:20 -0000
-@@ -40,6 +40,7 @@
- #include <stdio.h>
- #include <time.h>
- #include <errno.h>
-+#include <locale.h>
-
- #include "scim_private.h"
- #include "scim.h"
-Index: tests/Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim/tests/Makefile.am,v
-retrieving revision 1.15.2.1
-diff -u -p -r1.15.2.1 Makefile.am
---- tests/Makefile.am 10 Apr 2007 09:14:32 -0000 1.15.2.1
-+++ tests/Makefile.am 30 Apr 2007 03:52:20 -0000
-@@ -49,7 +49,6 @@ test_helper_la_CXXFLAGS = @GTK2_CFLAGS@
- test_helper_la_LDFLAGS = -avoid-version \
- -rpath $(helpermoduledir) \
- -module \
-- -lstdc++ \
- @LIBTOOL_EXPORT_OPTIONS@ \
- @GTK2_LIBS@ \
- @LTLIBINTL@
--- a/specs/patches/scim-1.4.6-on-nv-ss12-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,262 +0,0 @@
-Index: Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim/Makefile.am,v
-retrieving revision 1.22
-diff -u -p -r1.22 Makefile.am
---- Makefile.am 6 Dec 2005 10:14:49 -0000 1.22
-+++ Makefile.am 30 Apr 2007 03:52:13 -0000
-@@ -33,7 +33,7 @@ EXTRA_DIST = config.rpath THANKS \
- intltool-update.in
-
- AUTOMAKE_OPTIONS = gnu
--SUBDIRS = m4 intl src utils modules configs docs po extras data tests
-+SUBDIRS = src utils modules configs docs po extras data tests
-
- MAINTAINERCLEANFILES = Makefile.in \
- aclocal.m4 \
-@@ -61,7 +61,7 @@ pkgconfig_DATA = scim.pc \
- $(GTK_UTILS_PKGCONFIG) \
- $(X11_UTILS_PKGCONFIG)
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-
- .PHONY: update-ChangeLog
-
-Index: bootstrap
-===================================================================
-RCS file: /cvsroot/scim/scim/bootstrap,v
-retrieving revision 1.7
-diff -u -p -r1.7 bootstrap
---- bootstrap 7 Mar 2005 04:25:24 -0000 1.7
-+++ bootstrap 30 Apr 2007 03:52:13 -0000
-@@ -20,7 +20,7 @@
- #! /bin/sh
-
- set -x
--aclocal -I m4
-+aclocal
- autoheader
- libtoolize -c --automake
- automake --add-missing --copy --include-deps
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/scim/scim/configure.ac,v
-retrieving revision 1.148.2.9
-diff -u -p -r1.148.2.9 configure.ac
---- configure.ac 22 Apr 2007 06:29:43 -0000 1.148.2.9
-+++ configure.ac 30 Apr 2007 03:52:14 -0000
-@@ -66,7 +66,9 @@ AM_CONFIG_HEADER([config.h])
-
- # Init gettext
- ALL_LINGUAS="zh_CN zh_TW ja ko de fr it cs pa fi sv nl"
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+LTLIBINTL=
-+AC_SUBST(LTLIBINTL)
-
- # Init libtool
- AC_LIBTOOL_DLOPEN
-Index: extras/gtk2_immodule/Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim/extras/gtk2_immodule/Makefile.am,v
-retrieving revision 1.27.2.1
-diff -u -p -r1.27.2.1 Makefile.am
---- extras/gtk2_immodule/Makefile.am 10 Apr 2007 09:14:31 -0000 1.27.2.1
-+++ extras/gtk2_immodule/Makefile.am 30 Apr 2007 03:52:14 -0000
-@@ -38,13 +38,13 @@ module_LTLIBRARIES = $(CONFIG_GTK2_IMMOD
-
- im_scim_la_SOURCES = gtkimcontextscim.cpp imscim.cpp
-
--im_scim_la_CXXFLAGS=@GTK2_CFLAGS@
-+im_scim_la_CXXFLAGS=@GTK2_CFLAGS@ \
-+ -instlib=$(top_builddir)/src/.libs/libscim-1.0.so
- im_scim_la_CFLAGS =@GTK2_CFLAGS@
-
- im_scim_la_LDFLAGS = -rpath $(moduledir) \
- -avoid-version \
- -module \
-- -lstdc++ \
- $(LD_VERSION_SCRIPT_OPTION) \
- @GTK2_LIBS@
-
-Index: extras/setup/Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim/extras/setup/Makefile.am,v
-retrieving revision 1.12.2.1
-diff -u -p -r1.12.2.1 Makefile.am
---- extras/setup/Makefile.am 10 Apr 2007 09:14:31 -0000 1.12.2.1
-+++ extras/setup/Makefile.am 30 Apr 2007 03:52:14 -0000
-@@ -55,7 +55,6 @@ setup_la_CXXFLAGS = @GTK2_CFLAGS@
- setup_la_LDFLAGS = -avoid-version \
- -rpath $(moduledir) \
- -module \
-- -lstdc++ \
- @LIBTOOL_EXPORT_OPTIONS@ \
- @GTK2_LIBS@ \
- @LTLIBINTL@
-Index: modules/FrontEnd/scim_x11_frontend.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim/modules/FrontEnd/scim_x11_frontend.cpp,v
-retrieving revision 1.179.2.4
-diff -u -p -r1.179.2.4 scim_x11_frontend.cpp
---- modules/FrontEnd/scim_x11_frontend.cpp 11 Apr 2007 06:10:42 -0000 1.179.2.4
-+++ modules/FrontEnd/scim_x11_frontend.cpp 30 Apr 2007 03:52:15 -0000
-@@ -46,6 +46,7 @@
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
- #include <X11/Xutil.h>
-+#include <locale.h>
- #include "IMdkit/IMdkit.h"
- #include "IMdkit/Xi18n.h"
-
-Index: src/Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim/src/Makefile.am,v
-retrieving revision 1.55.2.1
-diff -u -p -r1.55.2.1 Makefile.am
---- src/Makefile.am 10 Apr 2007 09:14:31 -0000 1.55.2.1
-+++ src/Makefile.am 30 Apr 2007 03:52:16 -0000
-@@ -134,8 +134,7 @@ libscim@SCIM_EPOCH@_la_LDFLAGS= -version
- $(LD_VERSION_SCRIPT_OPTION) \
- @LIBTOOL_EXPORT_OPTIONS@ \
- @LIBICONV@ \
-- @LTLIBINTL@ \
-- -lstdc++
-+ @LTLIBINTL@
-
- libscim@SCIM_EPOCH@_la_LIBADD = libltdlc.la
-
-Index: src/ltdl.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim/src/ltdl.cpp,v
-retrieving revision 1.2
-diff -u -p -r1.2 ltdl.cpp
---- src/ltdl.cpp 13 Aug 2004 00:02:39 -0000 1.2
-+++ src/ltdl.cpp 30 Apr 2007 03:52:17 -0000
-@@ -3372,7 +3372,7 @@ lt_dlopenext (
- assert (filename);
-
- len = LT_STRLEN (filename);
-- ext = strrchr (filename, '.');
-+ ext = strrchr ((char*)filename, '.');
-
- /* If FILENAME already bears a suitable extension, there is no need
- to try appending additional extensions. */
-Index: src/scim.h
-===================================================================
-RCS file: /cvsroot/scim/scim/src/scim.h,v
-retrieving revision 1.38
-diff -u -p -r1.38 scim.h
---- src/scim.h 17 May 2005 06:45:14 -0000 1.38
-+++ src/scim.h 30 Apr 2007 03:52:17 -0000
-@@ -298,14 +298,14 @@
- #include <scim_global_config.h>
- #endif
-
--#ifdef Uses_SCIM_OBJECT
-- #include <scim_object.h>
--#endif
--
- #ifdef Uses_SCIM_POINTER
- #include <scim_pointer.h>
- #endif
-
-+#ifdef Uses_SCIM_OBJECT
-+ #include <scim_object.h>
-+#endif
-+
- #ifdef Uses_SCIM_SLOT
- #include <scim_slot.h>
- #endif
-Index: src/scim_pointer.h
-===================================================================
-RCS file: /cvsroot/scim/scim/src/scim_pointer.h,v
-retrieving revision 1.11
-diff -u -p -r1.11 scim_pointer.h
---- src/scim_pointer.h 10 Jan 2005 08:30:54 -0000 1.11
-+++ src/scim_pointer.h 30 Apr 2007 03:52:17 -0000
-@@ -84,7 +84,7 @@ public:
- //!<
- //!< <BR>Initialize a new Pointer with any dumb pointer.
-
-- Pointer(Pointer& src) : t(0)
-+ Pointer(const Pointer& src) : t(0)
- {
- set(src.get());
- }
-Index: src/scim_socket.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim/src/scim_socket.cpp,v
-retrieving revision 1.44
-diff -u -p -r1.44 scim_socket.cpp
---- src/scim_socket.cpp 1 Dec 2005 08:27:36 -0000 1.44
-+++ src/scim_socket.cpp 30 Apr 2007 03:52:19 -0000
-@@ -46,6 +46,10 @@
- #include <errno.h>
- #include <signal.h>
-
-+#if defined(sun) && !defined(SUN_LEN)
-+#define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
-+#endif
-+
- #include "scim_private.h"
- #include "scim.h"
-
-Index: src/scim_transaction.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim/src/scim_transaction.cpp,v
-retrieving revision 1.13.2.1
-diff -u -p -r1.13.2.1 scim_transaction.cpp
---- src/scim_transaction.cpp 7 Jun 2006 09:27:57 -0000 1.13.2.1
-+++ src/scim_transaction.cpp 30 Apr 2007 03:52:19 -0000
-@@ -791,7 +791,8 @@ TransactionReader::get_data (String &str
- }
-
- if (len)
-- str = String (m_impl->m_holder->m_buffer + m_impl->m_read_pos, m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
-+ str = String ((const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos),
-+ (const char*)m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
- else
- str = String ("");
-
-@@ -827,7 +828,8 @@ TransactionReader::get_data (WideString
- }
-
- if (len)
-- mbs = String (m_impl->m_holder->m_buffer + m_impl->m_read_pos, m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
-+ mbs = String ((const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos),
-+ (const char*)m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
- else
- mbs = String ("");
-
-Index: src/scim_utility.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim/src/scim_utility.cpp,v
-retrieving revision 1.48.2.5
-diff -u -p -r1.48.2.5 scim_utility.cpp
---- src/scim_utility.cpp 2 Nov 2006 04:11:51 -0000 1.48.2.5
-+++ src/scim_utility.cpp 30 Apr 2007 03:52:20 -0000
-@@ -40,6 +40,7 @@
- #include <stdio.h>
- #include <time.h>
- #include <errno.h>
-+#include <locale.h>
-
- #include "scim_private.h"
- #include "scim.h"
-Index: tests/Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim/tests/Makefile.am,v
-retrieving revision 1.15.2.1
-diff -u -p -r1.15.2.1 Makefile.am
---- tests/Makefile.am 10 Apr 2007 09:14:32 -0000 1.15.2.1
-+++ tests/Makefile.am 30 Apr 2007 03:52:20 -0000
-@@ -49,7 +49,6 @@ test_helper_la_CXXFLAGS = @GTK2_CFLAGS@
- test_helper_la_LDFLAGS = -avoid-version \
- -rpath $(helpermoduledir) \
- -module \
-- -lstdc++ \
- @LIBTOOL_EXPORT_OPTIONS@ \
- @GTK2_LIBS@ \
- @LTLIBINTL@
--- a/specs/patches/scim-1.4.7-on-nv-ss12-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +0,0 @@
-Index: src/scim.h
-===================================================================
---- src/scim.h (revision 56)
-+++ src/scim.h (working copy)
-@@ -298,14 +298,14 @@
- #include <scim_global_config.h>
- #endif
-
-+#ifdef Uses_SCIM_POINTER
-+ #include <scim_pointer.h>
-+#endif
-+
- #ifdef Uses_SCIM_OBJECT
- #include <scim_object.h>
- #endif
-
--#ifdef Uses_SCIM_POINTER
-- #include <scim_pointer.h>
--#endif
--
- #ifdef Uses_SCIM_SLOT
- #include <scim_slot.h>
- #endif
-Index: src/ltdl.cpp
-===================================================================
---- src/ltdl.cpp (revision 56)
-+++ src/ltdl.cpp (working copy)
-@@ -3372,7 +3372,7 @@
- assert (filename);
-
- len = LT_STRLEN (filename);
-- ext = strrchr (filename, '.');
-+ ext = strrchr ((char*)filename, '.');
-
- /* If FILENAME already bears a suitable extension, there is no need
- to try appending additional extensions. */
-Index: src/scim_socket.cpp
-===================================================================
---- src/scim_socket.cpp (revision 56)
-+++ src/scim_socket.cpp (working copy)
-@@ -50,6 +50,10 @@
- #include "scim_private.h"
- #include "scim.h"
-
-+#if defined(sun) && !defined(SUN_LEN)
-+#define SUN_LEN(su) (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
-+#endif
-+
- #define SCIM_SOCKET_SERVER_MAX_CLIENTS 256
-
- namespace scim {
-Index: src/scim_utility.cpp
-===================================================================
---- src/scim_utility.cpp (revision 56)
-+++ src/scim_utility.cpp (working copy)
-@@ -40,6 +40,7 @@
- #include <stdio.h>
- #include <time.h>
- #include <errno.h>
-+#include <locale.h>
-
- #include "scim_private.h"
- #include "scim.h"
-Index: src/scim_transaction.cpp
-===================================================================
---- src/scim_transaction.cpp (revision 56)
-+++ src/scim_transaction.cpp (working copy)
-@@ -792,7 +792,8 @@
- }
-
- if (len)
-- str = String (m_impl->m_holder->m_buffer + m_impl->m_read_pos, m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
-+ str = String ((const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos),
-+ (const char*)m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
- else
- str = String ("");
-
-@@ -828,7 +829,8 @@
- }
-
- if (len)
-- mbs = String (m_impl->m_holder->m_buffer + m_impl->m_read_pos, m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
-+ mbs = String ((const char*)(m_impl->m_holder->m_buffer + m_impl->m_read_pos),
-+ (const char*)m_impl->m_holder->m_buffer + m_impl->m_read_pos + len);
- else
- mbs = String ("");
-
-Index: src/scim_pointer.h
-===================================================================
---- src/scim_pointer.h (revision 56)
-+++ src/scim_pointer.h (working copy)
-@@ -84,7 +84,7 @@
- //!<
- //!< <BR>Initialize a new Pointer with any dumb pointer.
-
-- Pointer(Pointer& src) : t(0)
-+ Pointer(const Pointer& src) : t(0)
- {
- set(src.get());
- }
-Index: src/scim_types.h.in
-===================================================================
---- src/scim_types.h.in (revision 56)
-+++ src/scim_types.h.in (working copy)
-@@ -32,6 +32,10 @@
-
- @INCLUDE_STDINT@
-
-+#if defined (sun) && defined (_WCHAR_T)
-+# define __STDC_ISO_10646__
-+#endif
-+
- #ifdef __FreeBSD__
- # include <osreldate.h>
- # if __FreeBSD_version > 500035
-Index: src/Makefile.am
-===================================================================
---- src/Makefile.am (revision 56)
-+++ src/Makefile.am (working copy)
-@@ -134,8 +134,7 @@
- $(LD_VERSION_SCRIPT_OPTION) \
- @LIBTOOL_EXPORT_OPTIONS@ \
- @LIBICONV@ \
-- @LTLIBINTL@ \
-- -lstdc++
-+ @LTLIBINTL@
-
- libscim@SCIM_EPOCH@_la_LIBADD = libltdlc.la
-
-Index: tests/Makefile.am
-===================================================================
---- tests/Makefile.am (revision 56)
-+++ tests/Makefile.am (working copy)
-@@ -49,7 +49,6 @@
- test_helper_la_LDFLAGS = -avoid-version \
- -rpath $(helpermoduledir) \
- -module \
-- -lstdc++ \
- @LIBTOOL_EXPORT_OPTIONS@ \
- @GTK2_LIBS@ \
- @LTLIBINTL@
-Index: configure.ac
-===================================================================
---- configure.ac (revision 56)
-+++ configure.ac (working copy)
-@@ -66,7 +66,9 @@
-
- # Init gettext
- ALL_LINGUAS="zh_CN zh_TW ja ko de fr it cs pa fi sv nl"
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+LTLIBINTL=
-+AC_SUBST(LTLIBINTL)
-
- # Init libtool
- AC_LIBTOOL_DLOPEN
-Index: extras/setup/Makefile.am
-===================================================================
---- extras/setup/Makefile.am (revision 56)
-+++ extras/setup/Makefile.am (working copy)
-@@ -55,7 +55,6 @@
- setup_la_LDFLAGS = -avoid-version \
- -rpath $(moduledir) \
- -module \
-- -lstdc++ \
- @LIBTOOL_EXPORT_OPTIONS@ \
- @GTK2_LIBS@ \
- @LTLIBINTL@
-Index: extras/gtk2_immodule/Makefile.am
-===================================================================
---- extras/gtk2_immodule/Makefile.am (revision 56)
-+++ extras/gtk2_immodule/Makefile.am (working copy)
-@@ -38,13 +38,13 @@
-
- im_scim_la_SOURCES = gtkimcontextscim.cpp imscim.cpp
-
--im_scim_la_CXXFLAGS=@GTK2_CFLAGS@
-+im_scim_la_CXXFLAGS=@GTK2_CFLAGS@ \
-+ -instlib=$(top_builddir)/src/.libs/libscim-1.0.so
- im_scim_la_CFLAGS =@GTK2_CFLAGS@
-
- im_scim_la_LDFLAGS = -rpath $(moduledir) \
- -avoid-version \
- -module \
-- -lstdc++ \
- $(LD_VERSION_SCRIPT_OPTION) \
- @GTK2_LIBS@
-
-Index: modules/FrontEnd/scim_x11_frontend.cpp
-===================================================================
---- modules/FrontEnd/scim_x11_frontend.cpp (revision 56)
-+++ modules/FrontEnd/scim_x11_frontend.cpp (working copy)
-@@ -46,6 +46,7 @@
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
- #include <X11/Xutil.h>
-+#include <locale.h>
- #include "IMdkit/IMdkit.h"
- #include "IMdkit/Xi18n.h"
-
-Index: bootstrap
-===================================================================
---- bootstrap (revision 56)
-+++ bootstrap (working copy)
-@@ -20,7 +20,7 @@
- #! /bin/sh
-
- set -x
--aclocal -I m4
-+aclocal
- autoheader
- libtoolize -c --automake
- automake --add-missing --copy --include-deps
-Index: Makefile.am
-===================================================================
---- Makefile.am (revision 56)
-+++ Makefile.am (working copy)
-@@ -33,7 +33,7 @@
- intltool-update.in
-
- AUTOMAKE_OPTIONS = gnu
--SUBDIRS = m4 intl src utils modules configs docs po extras data tests
-+SUBDIRS = src utils modules configs docs po extras data tests
-
- MAINTAINERCLEANFILES = Makefile.in \
- aclocal.m4 \
-@@ -61,7 +61,7 @@
- $(GTK_UTILS_PKGCONFIG) \
- $(X11_UTILS_PKGCONFIG)
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-
- .PHONY: update-ChangeLog
-
--- a/specs/patches/scim-anthy-1.2.3-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +0,0 @@
-Index: Makefile.am
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/Makefile.am,v
-retrieving revision 1.3
-diff -u -p -r1.3 Makefile.am
---- Makefile.am 19 Jan 2006 08:40:43 -0000 1.3
-+++ Makefile.am 14 May 2007 07:57:51 -0000
-@@ -15,8 +15,8 @@
- ## along with this program; if not, write to the Free Software
- ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
--SUBDIRS = intl po m4 src data
-+SUBDIRS = po src data
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-
- EXTRA_DIST = config.rpath
-Index: bootstrap
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/bootstrap,v
-retrieving revision 1.1
-diff -u -p -r1.1 bootstrap
---- bootstrap 22 Nov 2004 07:57:00 -0000 1.1
-+++ bootstrap 14 May 2007 07:57:51 -0000
-@@ -20,6 +20,7 @@
- #! /bin/sh
-
- set -x
-+glib-gettextize --force
- aclocal -I m4
- autoheader
- libtoolize -c --automake
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/configure.ac,v
-retrieving revision 1.27.2.2
-diff -u -p -r1.27.2.2 configure.ac
---- configure.ac 17 Apr 2007 06:41:38 -0000 1.27.2.2
-+++ configure.ac 14 May 2007 07:57:51 -0000
-@@ -25,7 +25,9 @@ AM_CONFIG_HEADER(config.h)
-
- # Init gettext
- ALL_LINGUAS="ja"
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+LTLIBINTL=
-+AC_SUBST(LTLIBINTL)
-
- GETTEXT_PACKAGE=scim-anthy
- AC_SUBST(GETTEXT_PACKAGE)
-Index: src/scim_anthy_action.cpp
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_action.cpp,v
-retrieving revision 1.7
-diff -u -p -r1.7 scim_anthy_action.cpp
---- src/scim_anthy_action.cpp 13 Jul 2006 07:41:51 -0000 1.7
-+++ src/scim_anthy_action.cpp 14 May 2007 07:57:53 -0000
-@@ -21,6 +21,7 @@
- #include <config.h>
- #endif
-
-+#include "scim_anthy_imengine.h"
- #include "scim_anthy_action.h"
- #include "scim_anthy_utils.h"
-
-Index: src/scim_anthy_conversion.cpp
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_conversion.cpp,v
-retrieving revision 1.40.2.1
-diff -u -p -r1.40.2.1 scim_anthy_conversion.cpp
---- src/scim_anthy_conversion.cpp 30 Oct 2006 05:13:09 -0000 1.40.2.1
-+++ src/scim_anthy_conversion.cpp 14 May 2007 07:57:53 -0000
-@@ -387,10 +387,11 @@ Conversion::get_segment_string (int segm
- } else {
- int len = anthy_get_segment (m_anthy_context, real_seg, cand, NULL, 0);
- if (len > 0) {
-- char buf[len + 1];
-+ char *buf = new char[len + 1];
- anthy_get_segment (m_anthy_context, real_seg, cand, buf, len + 1);
- buf[len] = '\0';
- m_iconv.convert (segment_str, buf, len);
-+ delete[] buf;
- }
- }
-
-@@ -534,7 +535,7 @@ Conversion::get_candidates (CommonLookup
- if (len <= 0)
- continue;
-
-- char buf[len + 1];
-+ char *buf = new char[len + 1];
- anthy_get_prediction (m_anthy_context, i, buf, len + 1);
- buf[len] = '\0';
-
-@@ -542,6 +543,7 @@ Conversion::get_candidates (CommonLookup
- m_iconv.convert (cand, buf);
-
- table.append_candidate (cand);
-+ delete[] buf;
- }
- #endif /* HAS_ANTHY_PREDICTION */
- } else if (is_converting ()) {
-@@ -571,7 +573,7 @@ Conversion::get_candidates (CommonLookup
- if (len <= 0)
- continue;
-
-- char buf[len + 1];
-+ char *buf = new char[len + 1];
- anthy_get_segment (m_anthy_context, real_segment_id,
- i, buf, len + 1);
-
-@@ -579,6 +581,7 @@ Conversion::get_candidates (CommonLookup
- m_iconv.convert (cand_wide, buf, len);
-
- table.append_candidate (cand_wide);
-+ delete[] buf;
- }
-
- table.set_cursor_pos (get_selected_candidate ());
-@@ -800,12 +803,13 @@ Conversion::get_prediction_string (int c
- if (len <= 0)
- return WideString ();
-
-- char buf[len + 1];
-+ char *buf = new char[len + 1];
- anthy_get_prediction (m_anthy_context, candidate_id, buf, len + 1);
- buf[len] = '\0';
-
- WideString cand;
- m_iconv.convert (cand, buf);
-+ delete[] buf;
-
- return cand;
- #else /* HAS_ANTHY_PREDICTION */
-Index: src/scim_anthy_table_editor.cpp
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_table_editor.cpp,v
-retrieving revision 1.7
-diff -u -p -r1.7 scim_anthy_table_editor.cpp
---- src/scim_anthy_table_editor.cpp 4 Oct 2005 10:28:51 -0000 1.7
-+++ src/scim_anthy_table_editor.cpp 14 May 2007 07:57:54 -0000
-@@ -205,7 +205,7 @@ scim_anthy_table_editor_set_columns (Sci
- if (n_cols <= 0)
- return;
-
-- GType types[n_cols];
-+ GType *types = new GType[n_cols];
- for (gint i = 0; i < n_cols; i++)
- types[i] = G_TYPE_STRING;
-
-@@ -276,6 +276,7 @@ scim_anthy_table_editor_set_columns (Sci
-
- // clean
- g_object_unref (store);
-+ delete[] types;
- }
-
- const char *
-Index: src/scim_anthy_utils.cpp
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_utils.cpp,v
-retrieving revision 1.8.4.1
-diff -u -p -r1.8.4.1 scim_anthy_utils.cpp
---- src/scim_anthy_utils.cpp 6 Jan 2007 00:54:06 -0000 1.8.4.1
-+++ src/scim_anthy_utils.cpp 14 May 2007 07:57:54 -0000
-@@ -275,7 +275,7 @@ util_launch_program (const char *command
-
- /* split string */
- unsigned int len = strlen (command);
-- char tmp[len + 1];
-+ char *tmp = new char[len + 1];
- strncpy (tmp, command, len);
- tmp[len] = '\0';
-
-@@ -295,7 +295,7 @@ util_launch_program (const char *command
- if (array.size () <= 0) return;
- array.push_back (NULL);
-
-- char *args[array.size()];
-+ char **args = new char*[array.size()];
- for (unsigned int i = 0; i < array.size (); i++)
- args[i] = array[i];
-
-@@ -324,6 +324,9 @@ util_launch_program (const char *command
- int status;
- waitpid(child_pid, &status, 0);
- }
-+
-+ delete[] tmp;
-+ delete[] args;
- }
-
- }
-Index: scim_color_button.cpp
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_color_button.cpp,v
-retrieving revision 1.4
-diff -u -p -r1.4 scim_color_button.cpp
---- src/scim_color_button.cpp 6 Jul 2005 15:55:16 -0000 1.4
-+++ src/scim_color_button.cpp 28 May 2007 08:05:46 -0000
-@@ -89,6 +89,9 @@ scim_color_button_get_type (void)
- (GInstanceInitFunc) scim_color_button_init,
- };
-
-+ type = g_type_from_name ("ScimColorButton");
-+
-+ if (!type)
- type = g_type_register_static (GTK_TYPE_DRAWING_AREA,
- "ScimColorButton",
- &info, (GTypeFlags) 0);
-
--- a/specs/patches/scim-anthy-1.2.4-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-Index: Makefile.am
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/Makefile.am,v
-retrieving revision 1.3
-diff -u -p -r1.3 Makefile.am
---- Makefile.am 19 Jan 2006 08:40:43 -0000 1.3
-+++ Makefile.am 14 May 2007 07:57:51 -0000
-@@ -15,8 +15,8 @@
- ## along with this program; if not, write to the Free Software
- ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
--SUBDIRS = intl po m4 src data
-+SUBDIRS = po src data
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-
- EXTRA_DIST = config.rpath
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/configure.ac,v
-retrieving revision 1.27.2.2
-diff -u -p -r1.27.2.2 configure.ac
---- configure.ac 17 Apr 2007 06:41:38 -0000 1.27.2.2
-+++ configure.ac 14 May 2007 07:57:51 -0000
-@@ -25,7 +25,9 @@ AM_CONFIG_HEADER(config.h)
-
- # Init gettext
- ALL_LINGUAS="ja"
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+LTLIBINTL=
-+AC_SUBST(LTLIBINTL)
-
- GETTEXT_PACKAGE=scim-anthy
- AC_SUBST(GETTEXT_PACKAGE)
-Index: src/scim_anthy_action.cpp
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_action.cpp,v
-retrieving revision 1.7
-diff -u -p -r1.7 scim_anthy_action.cpp
---- src/scim_anthy_action.cpp 13 Jul 2006 07:41:51 -0000 1.7
-+++ src/scim_anthy_action.cpp 14 May 2007 07:57:53 -0000
-@@ -21,6 +21,7 @@
- #include <config.h>
- #endif
-
-+#include "scim_anthy_imengine.h"
- #include "scim_anthy_action.h"
- #include "scim_anthy_utils.h"
-
-Index: src/scim_anthy_conversion.cpp
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_conversion.cpp,v
-retrieving revision 1.40.2.1
-diff -u -p -r1.40.2.1 scim_anthy_conversion.cpp
---- src/scim_anthy_conversion.cpp 30 Oct 2006 05:13:09 -0000 1.40.2.1
-+++ src/scim_anthy_conversion.cpp 14 May 2007 07:57:53 -0000
-@@ -387,10 +387,11 @@ Conversion::get_segment_string (int segm
- } else {
- int len = anthy_get_segment (m_anthy_context, real_seg, cand, NULL, 0);
- if (len > 0) {
-- char buf[len + 1];
-+ char *buf = new char[len + 1];
- anthy_get_segment (m_anthy_context, real_seg, cand, buf, len + 1);
- buf[len] = '\0';
- m_iconv.convert (segment_str, buf, len);
-+ delete[] buf;
- }
- }
-
-@@ -534,7 +535,7 @@ Conversion::get_candidates (CommonLookup
- if (len <= 0)
- continue;
-
-- char buf[len + 1];
-+ char *buf = new char[len + 1];
- anthy_get_prediction (m_anthy_context, i, buf, len + 1);
- buf[len] = '\0';
-
-@@ -542,6 +543,7 @@ Conversion::get_candidates (CommonLookup
- m_iconv.convert (cand, buf);
-
- table.append_candidate (cand);
-+ delete[] buf;
- }
- #endif /* HAS_ANTHY_PREDICTION */
- } else if (is_converting ()) {
-@@ -571,7 +573,7 @@ Conversion::get_candidates (CommonLookup
- if (len <= 0)
- continue;
-
-- char buf[len + 1];
-+ char *buf = new char[len + 1];
- anthy_get_segment (m_anthy_context, real_segment_id,
- i, buf, len + 1);
-
-@@ -579,6 +581,7 @@ Conversion::get_candidates (CommonLookup
- m_iconv.convert (cand_wide, buf, len);
-
- table.append_candidate (cand_wide);
-+ delete[] buf;
- }
-
- table.set_cursor_pos (get_selected_candidate ());
-@@ -800,12 +803,13 @@ Conversion::get_prediction_string (int c
- if (len <= 0)
- return WideString ();
-
-- char buf[len + 1];
-+ char *buf = new char[len + 1];
- anthy_get_prediction (m_anthy_context, candidate_id, buf, len + 1);
- buf[len] = '\0';
-
- WideString cand;
- m_iconv.convert (cand, buf);
-+ delete[] buf;
-
- return cand;
- #else /* HAS_ANTHY_PREDICTION */
-Index: src/scim_anthy_table_editor.cpp
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_table_editor.cpp,v
-retrieving revision 1.7
-diff -u -p -r1.7 scim_anthy_table_editor.cpp
---- src/scim_anthy_table_editor.cpp 4 Oct 2005 10:28:51 -0000 1.7
-+++ src/scim_anthy_table_editor.cpp 14 May 2007 07:57:54 -0000
-@@ -205,7 +205,7 @@ scim_anthy_table_editor_set_columns (Sci
- if (n_cols <= 0)
- return;
-
-- GType types[n_cols];
-+ GType *types = new GType[n_cols];
- for (gint i = 0; i < n_cols; i++)
- types[i] = G_TYPE_STRING;
-
-@@ -276,6 +276,7 @@ scim_anthy_table_editor_set_columns (Sci
-
- // clean
- g_object_unref (store);
-+ delete[] types;
- }
-
- const char *
-Index: src/scim_anthy_utils.cpp
-===================================================================
-RCS file: /cvsroot/scim-imengine/scim-anthy/src/scim_anthy_utils.cpp,v
-retrieving revision 1.8.4.1
-diff -u -p -r1.8.4.1 scim_anthy_utils.cpp
---- src/scim_anthy_utils.cpp 6 Jan 2007 00:54:06 -0000 1.8.4.1
-+++ src/scim_anthy_utils.cpp 14 May 2007 07:57:54 -0000
-@@ -275,7 +275,7 @@ util_launch_program (const char *command
-
- /* split string */
- unsigned int len = strlen (command);
-- char tmp[len + 1];
-+ char *tmp = new char[len + 1];
- strncpy (tmp, command, len);
- tmp[len] = '\0';
-
-@@ -295,7 +295,7 @@ util_launch_program (const char *command
- if (array.size () <= 0) return;
- array.push_back (NULL);
-
-- char *args[array.size()];
-+ char **args = new char*[array.size()];
- for (unsigned int i = 0; i < array.size (); i++)
- args[i] = array[i];
-
-@@ -324,6 +324,9 @@ util_launch_program (const char *command
- int status;
- waitpid(child_pid, &status, 0);
- }
-+
-+ delete[] tmp;
-+ delete[] args;
- }
-
- }
--- a/specs/patches/scim-bridge-0.4.10-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/configure.ac,v
-retrieving revision 1.40
-diff -u -p -r1.40 configure.ac
---- configure.ac 10 Feb 2007 16:25:30 -0000 1.40
-+++ configure.ac 15 May 2007 09:59:54 -0000
-@@ -132,8 +132,8 @@ AC_ARG_ENABLE(qt3-immodule,
-
- if test "$enable_debug" = "yes"; then
- AC_DEFINE(ENABLE_DEBUG,1,[Define this to enable the debug facility in libscim])
-- CFLAGS="$CFLAGS -g -Wall -Wmissing-declarations -Wreturn-type"
-- CXXFLAGS="$CXXFLAGS -g -Wall -Wshadow -Woverloaded-virtual -Wreturn-type"
-+ CFLAGS="$CFLAGS -g"
-+ CXXFLAGS="$CXXFLAGS -g"
- else
- enable_debug=no
- fi
-Index: agent/scim-bridge-agent-client-listener.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/agent/scim-bridge-agent-client-listener.cpp,v
-retrieving revision 1.29
-diff -u -p -r1.29 scim-bridge-agent-client-listener.cpp
---- agent/scim-bridge-agent-client-listener.cpp 30 Sep 2006 16:35:20 -0000 1.29
-+++ agent/scim-bridge-agent-client-listener.cpp 15 May 2007 09:59:55 -0000
-@@ -19,6 +19,7 @@
-
- #include <errno.h>
- #include <unistd.h>
-+#include <alloca.h>
-
- #include <sys/select.h>
- #include <sys/socket.h>
-Index: agent/scim-bridge-agent-imcontext.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/agent/scim-bridge-agent-imcontext.cpp,v
-retrieving revision 1.68
-diff -u -p -r1.68 scim-bridge-agent-imcontext.cpp
---- agent/scim-bridge-agent-imcontext.cpp 18 Feb 2007 02:15:51 -0000 1.68
-+++ agent/scim-bridge-agent-imcontext.cpp 15 May 2007 09:59:56 -0000
-@@ -18,7 +18,7 @@
- */
-
- #include <assert.h>
--
-+#include <libintl.h>
- #include <sys/time.h>
-
- #include <list>
-Index: agent/scim-bridge-agent-output.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/agent/scim-bridge-agent-output.cpp,v
-retrieving revision 1.19
-diff -u -p -r1.19 scim-bridge-agent-output.cpp
---- agent/scim-bridge-agent-output.cpp 24 Sep 2006 04:30:42 -0000 1.19
-+++ agent/scim-bridge-agent-output.cpp 15 May 2007 09:59:56 -0000
-@@ -71,10 +71,9 @@ static void vxsyslog (int priority, cons
- {
- if (!initialized) static_initialize ();
-
-- char *expanded_format;
-- vasprintf (&expanded_format, format, ap);
-+ char expanded_format[1024];
-+ vsnprintf (expanded_format, sizeof(expanded_format), format, ap);
- syslog (priority, "%s", expanded_format);
-- free (expanded_format);
- }
-
-
-Index: agent/utils/scim-bridge-agent-panel-client.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/agent/utils/scim-bridge-agent-panel-client.cpp,v
-retrieving revision 1.14
-diff -u -p -r1.14 scim-bridge-agent-panel-client.cpp
---- agent/utils/scim-bridge-agent-panel-client.cpp 10 Dec 2006 05:32:52 -0000 1.14
-+++ agent/utils/scim-bridge-agent-panel-client.cpp 15 May 2007 09:59:56 -0000
-@@ -171,6 +171,47 @@ ScimBridgeAgentPanelClientImpl::~ScimBri
- scim_bridge_free_display (display);
- }
-
-+#ifndef HAVE_DAEMON
-+void closeall(int fd)
-+{
-+ int fdlimit = sysconf(_SC_OPEN_MAX);
-+
-+ while (fd < fdlimit)
-+ close(fd++);
-+}
-+
-+int daemon(int nochdir, int noclose)
-+{
-+ switch (fork())
-+ {
-+ case 0: break;
-+ case -1: return -1;
-+ default: _exit(0);
-+ }
-+
-+ if (setsid() < 0)
-+ return -1;
-+
-+ switch (fork())
-+ {
-+ case 0: break;
-+ case -1: return -1;
-+ default: _exit(0);
-+ }
-+
-+ if (!nochdir)
-+ chdir("/");
-+
-+ if (!noclose)
-+ {
-+ closeall(0);
-+ open("/dev/null",O_RDWR);
-+ dup(0); dup(0);
-+ }
-+
-+ return 0;
-+}
-+#endif
-
- retval_t ScimBridgeAgentPanelClientImpl::launch_panel ()
- {
-Index: common/scim-bridge-display.c
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/common/scim-bridge-display.c,v
-retrieving revision 1.7
-diff -u -p -r1.7 scim-bridge-display.c
---- common/scim-bridge-display.c 24 Sep 2006 10:06:36 -0000 1.7
-+++ common/scim-bridge-display.c 15 May 2007 09:59:56 -0000
-@@ -20,6 +20,7 @@
- #include <malloc.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <strings.h>
-
- #include "scim-bridge-display.h"
- #include "scim-bridge-output.h"
-Index: common/scim-bridge-string.c
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/common/scim-bridge-string.c,v
-retrieving revision 1.12
-diff -u -p -r1.12 scim-bridge-string.c
---- common/scim-bridge-string.c 23 Nov 2006 01:14:31 -0000 1.12
-+++ common/scim-bridge-string.c 15 May 2007 09:59:56 -0000
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <wchar.h>
-+#include <alloca.h>
-
- #include "scim-bridge-string.h"
- #include "scim-bridge-output.h"
-Index: common/scim-bridge-string.h
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/common/scim-bridge-string.h,v
-retrieving revision 1.8
-diff -u -p -r1.8 scim-bridge-string.h
---- common/scim-bridge-string.h 24 Sep 2006 10:06:36 -0000 1.8
-+++ common/scim-bridge-string.h 15 May 2007 09:59:56 -0000
-@@ -41,7 +41,7 @@ extern "C"
- /**
- * The type for wide string.
- */
-- typedef uint32 wchar;
-+ typedef unsigned int wchar;
- #else
- /**
- * The type for wide string.
--- a/specs/patches/scim-bridge-0.4.13-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/configure.ac,v
-retrieving revision 1.40
-diff -u -p -r1.40 configure.ac
---- configure.ac 10 Feb 2007 16:25:30 -0000 1.40
-+++ configure.ac 15 May 2007 09:59:54 -0000
-@@ -147,8 +147,8 @@
-
- if test "$enable_debug" = "yes"; then
- AC_DEFINE(ENABLE_DEBUG,1,[Define this to enable the debug facility in libscim])
-- CFLAGS="$CFLAGS -g -Wall -Wmissing-declarations -Wreturn-type"
-- CXXFLAGS="$CXXFLAGS -g -Wall -Wshadow -Woverloaded-virtual -Wreturn-type"
-+ CFLAGS="$CFLAGS -g"
-+ CXXFLAGS="$CXXFLAGS -g"
- else
- enable_debug=no
- fi
-Index: agent/scim-bridge-agent-client-listener.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/agent/scim-bridge-agent-client-listener.cpp,v
-retrieving revision 1.29
-diff -u -p -r1.29 scim-bridge-agent-client-listener.cpp
---- agent/scim-bridge-agent-client-listener.cpp 30 Sep 2006 16:35:20 -0000 1.29
-+++ agent/scim-bridge-agent-client-listener.cpp 15 May 2007 09:59:55 -0000
-@@ -20,6 +20,7 @@
- #include <assert.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <alloca.h>
-
- #include <sys/select.h>
- #include <sys/socket.h>
-Index: agent/scim-bridge-agent-imcontext.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/agent/scim-bridge-agent-imcontext.cpp,v
-retrieving revision 1.68
-diff -u -p -r1.68 scim-bridge-agent-imcontext.cpp
---- agent/scim-bridge-agent-imcontext.cpp 18 Feb 2007 02:15:51 -0000 1.68
-+++ agent/scim-bridge-agent-imcontext.cpp 15 May 2007 09:59:56 -0000
-@@ -18,7 +18,7 @@
- */
-
- #include <assert.h>
--
-+#include <libintl.h>
- #include <sys/time.h>
-
- #include <list>
-Index: agent/scim-bridge-agent-output.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/agent/scim-bridge-agent-output.cpp,v
-retrieving revision 1.19
-diff -u -p -r1.19 scim-bridge-agent-output.cpp
---- agent/scim-bridge-agent-output.cpp 24 Sep 2006 04:30:42 -0000 1.19
-+++ agent/scim-bridge-agent-output.cpp 15 May 2007 09:59:56 -0000
-@@ -71,10 +71,9 @@ static void vxsyslog (int priority, cons
- {
- if (!initialized) static_initialize ();
-
-- char *expanded_format;
-- vasprintf (&expanded_format, format, ap);
-+ char expanded_format[1024];
-+ vsnprintf (expanded_format, sizeof(expanded_format), format, ap);
- syslog (priority, "%s", expanded_format);
-- free (expanded_format);
- }
-
-
-Index: agent/utils/scim-bridge-agent-panel-client.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/agent/utils/scim-bridge-agent-panel-client.cpp,v
-retrieving revision 1.14
-diff -u -p -r1.14 scim-bridge-agent-panel-client.cpp
---- agent/utils/scim-bridge-agent-panel-client.cpp 10 Dec 2006 05:32:52 -0000 1.14
-+++ agent/utils/scim-bridge-agent-panel-client.cpp 15 May 2007 09:59:56 -0000
-@@ -171,6 +171,47 @@ ScimBridgeAgentPanelClientImpl::~ScimBri
- scim_bridge_free_display (display);
- }
-
-+#ifndef HAVE_DAEMON
-+void closeall(int fd)
-+{
-+ int fdlimit = sysconf(_SC_OPEN_MAX);
-+
-+ while (fd < fdlimit)
-+ close(fd++);
-+}
-+
-+int daemon(int nochdir, int noclose)
-+{
-+ switch (fork())
-+ {
-+ case 0: break;
-+ case -1: return -1;
-+ default: _exit(0);
-+ }
-+
-+ if (setsid() < 0)
-+ return -1;
-+
-+ switch (fork())
-+ {
-+ case 0: break;
-+ case -1: return -1;
-+ default: _exit(0);
-+ }
-+
-+ if (!nochdir)
-+ chdir("/");
-+
-+ if (!noclose)
-+ {
-+ closeall(0);
-+ open("/dev/null",O_RDWR);
-+ dup(0); dup(0);
-+ }
-+
-+ return 0;
-+}
-+#endif
-
- retval_t ScimBridgeAgentPanelClientImpl::launch_panel ()
- {
-Index: common/scim-bridge-display.c
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/common/scim-bridge-display.c,v
-retrieving revision 1.7
-diff -u -p -r1.7 scim-bridge-display.c
---- common/scim-bridge-display.c 24 Sep 2006 10:06:36 -0000 1.7
-+++ common/scim-bridge-display.c 15 May 2007 09:59:56 -0000
-@@ -20,6 +20,7 @@
- #include <malloc.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <strings.h>
-
- #include "scim-bridge-display.h"
- #include "scim-bridge-output.h"
-Index: common/scim-bridge-string.c
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/common/scim-bridge-string.c,v
-retrieving revision 1.12
-diff -u -p -r1.12 scim-bridge-string.c
---- common/scim-bridge-string.c 23 Nov 2006 01:14:31 -0000 1.12
-+++ common/scim-bridge-string.c 15 May 2007 09:59:56 -0000
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <wchar.h>
-+#include <alloca.h>
-
- #include "scim-bridge-string.h"
- #include "scim-bridge-output.h"
-Index: common/scim-bridge-string.h
-===================================================================
-RCS file: /cvsroot/scim/scim-bridge/common/scim-bridge-string.h,v
-retrieving revision 1.8
-diff -u -p -r1.8 scim-bridge-string.h
---- common/scim-bridge-string.h 24 Sep 2006 10:06:36 -0000 1.8
-+++ common/scim-bridge-string.h 15 May 2007 09:59:56 -0000
-@@ -41,7 +41,7 @@ extern "C"
- /**
- * The type for wide string.
- */
-- typedef uint32 wchar;
-+ typedef unsigned int wchar;
- #else
- /**
- * The type for wide string.
--- a/specs/patches/scim-bridge-0.4.14-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-diff -ur Makefile.am Makefile.am
---- Makefile.am 2007-12-05 22:50:59.000000000 +0800
-+++ Makefile.am 2007-12-26 17:02:27.592966401 +0800
-@@ -27,7 +27,7 @@
- EXTRA_DIST = config.rpath m4/ChangeLog bootstrap intltool-extract.in intltool-merge.in intltool-update.in
-
- AUTOMAKE_OPTIONS = gnu
--SUBDIRS = po intl common client-common $(BUILD_DIR_GTK2_IMMODULE) $(BUILD_DIR_QT3_IMMODULE) $(BUILD_DIR_QT4_IMMODULE) $(BUILD_DIR_AGENT) $(BUILD_DIR_TESTS) $(BUILD_DIR_DOCUMENTS)
-+SUBDIRS = po common client-common $(BUILD_DIR_GTK2_IMMODULE) $(BUILD_DIR_QT3_IMMODULE) $(BUILD_DIR_QT4_IMMODULE) $(BUILD_DIR_AGENT) $(BUILD_DIR_TESTS) $(BUILD_DIR_DOCUMENTS)
-
- ## @start 1
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in $(AUX_DIST)
-@@ -36,5 +36,5 @@
-
- DISTCLEANFILES = intltool-extract intltool-merge intltool-update
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-
-diff -ur agent/scim-bridge-agent-application.cpp agent/scim-bridge-agent-application.cpp
---- agent/scim-bridge-agent-application.cpp 2007-11-07 21:09:35.000000000 +0800
-+++ agent/scim-bridge-agent-application.cpp 2007-12-26 17:04:05.235266866 +0800
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <locale.h>
-
- #include <iostream>
-
-diff -ur agent/scim-bridge-agent-client-listener.cpp agent/scim-bridge-agent-client-listener.cpp
---- agent/scim-bridge-agent-client-listener.cpp 2007-11-07 18:15:52.000000000 +0800
-+++ agent/scim-bridge-agent-client-listener.cpp 2007-12-26 17:06:22.856705702 +0800
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #include <unistd.h>
- #include <string.h>
-+#include <alloca.h>
-
- #include <sys/select.h>
- #include <sys/socket.h>
-diff -ur agent/scim-bridge-agent-output.cpp agent/scim-bridge-agent-output.cpp
---- agent/scim-bridge-agent-output.cpp 2007-06-02 11:33:47.000000000 +0800
-+++ agent/scim-bridge-agent-output.cpp 2007-12-26 16:40:38.935190435 +0800
-@@ -71,10 +71,9 @@
- {
- if (!initialized) static_initialize ();
-
-- char *expanded_format;
-- vasprintf (&expanded_format, format, ap);
-+ char expanded_format[1024];
-+ vsnprintf (expanded_format, sizeof(expanded_format), format, ap);
- syslog (priority, "%s", expanded_format);
-- free (expanded_format);
- }
-
-
-diff -ur agent/scim-bridge-agent.cpp agent/scim-bridge-agent.cpp
---- agent/scim-bridge-agent.cpp 2007-12-05 22:54:04.000000000 +0800
-+++ agent/scim-bridge-agent.cpp 2007-12-26 17:05:32.428913654 +0800
-@@ -22,6 +22,7 @@
- #include <signal.h>
- #include <string.h>
- #include <unistd.h>
-+#include <locale.h>
-
- #include <sys/select.h>
- #include <sys/time.h>
-diff -ur agent/utils/scim-bridge-agent-panel-client.cpp agent/utils/scim-bridge-agent-panel-client.cpp
---- agent/utils/scim-bridge-agent-panel-client.cpp 2007-06-02 11:33:47.000000000 +0800
-+++ agent/utils/scim-bridge-agent-panel-client.cpp 2007-12-26 16:40:38.941743738 +0800
-@@ -171,6 +171,47 @@
- scim_bridge_free_display (display);
- }
-
-+#ifndef HAVE_DAEMON
-+void closeall(int fd)
-+{
-+ int fdlimit = sysconf(_SC_OPEN_MAX);
-+
-+ while (fd < fdlimit)
-+ close(fd++);
-+}
-+
-+int daemon(int nochdir, int noclose)
-+{
-+ switch (fork())
-+ {
-+ case 0: break;
-+ case -1: return -1;
-+ default: _exit(0);
-+ }
-+
-+ if (setsid() < 0)
-+ return -1;
-+
-+ switch (fork())
-+ {
-+ case 0: break;
-+ case -1: return -1;
-+ default: _exit(0);
-+ }
-+
-+ if (!nochdir)
-+ chdir("/");
-+
-+ if (!noclose)
-+ {
-+ closeall(0);
-+ open("/dev/null",O_RDWR);
-+ dup(0); dup(0);
-+ }
-+
-+ return 0;
-+}
-+#endif
-
- retval_t ScimBridgeAgentPanelClientImpl::launch_panel ()
- {
-diff -ur bootstrap bootstrap
---- bootstrap 2007-06-02 11:33:46.000000000 +0800
-+++ bootstrap 2007-12-26 16:51:10.452073563 +0800
-@@ -20,6 +20,7 @@
- #! /bin/sh
-
- set -x
-+glib-gettextize --force
- aclocal
- autoheader
- libtoolize -c --automake
-diff -ur client-gtk/Makefile.am client-gtk/Makefile.am
---- client-gtk/Makefile.am 2007-06-14 22:42:13.000000000 +0800
-+++ client-gtk/Makefile.am 2008-08-23 07:36:24.445832916 +0800
-@@ -24,7 +24,7 @@
-
- noinst_HEADERS = scim-bridge-client-gtk.h scim-bridge-client-imcontext-gtk.h scim-bridge-client-key-event-utility-gtk.h
-
--moduledir = @GTK_LIBDIR@/gtk-2.0/immodules
-+moduledir = @GTK_LIBDIR@/gtk-2.0/@GTK_BINARY_VERSION@/immodules
-
- module_LTLIBRARIES = im-scim-bridge.la
-
-diff -ur common/scim-bridge-display.c common/scim-bridge-display.c
---- common/scim-bridge-display.c 2007-06-02 11:33:46.000000000 +0800
-+++ common/scim-bridge-display.c 2007-12-26 16:40:38.947033591 +0800
-@@ -20,6 +20,7 @@
- #include <malloc.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <strings.h>
-
- #include "scim-bridge-display.h"
- #include "scim-bridge-output.h"
-diff -ur common/scim-bridge-string.c common/scim-bridge-string.c
---- common/scim-bridge-string.c 2007-06-02 11:33:46.000000000 +0800
-+++ common/scim-bridge-string.c 2007-12-26 16:40:38.952738727 +0800
-@@ -24,6 +24,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <wchar.h>
-+#include <alloca.h>
-
- #include "scim-bridge-string.h"
- #include "scim-bridge-output.h"
-diff -ur common/scim-bridge-string.h common/scim-bridge-string.h
---- common/scim-bridge-string.h 2007-06-02 11:33:46.000000000 +0800
-+++ common/scim-bridge-string.h 2007-12-26 16:40:38.953783440 +0800
-@@ -41,7 +41,7 @@
- /**
- * The type for wide string.
- */
-- typedef uint32 wchar;
-+ typedef unsigned int wchar;
- #else
- /**
- * The type for wide string.
-diff -ur configure.ac configure.ac
---- configure.ac 2007-12-05 23:50:13.000000000 +0800
-+++ configure.ac 2007-12-26 16:59:41.275906916 +0800
-@@ -42,7 +42,9 @@
- # Init gettext
- #ALL_LINGUAS="zh_CN zh_TW ja ko de fr it cs pa fi sv nl"
- ALL_LINGUAS=""
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+LTLIBINTL=
-+AC_SUBST(LTLIBINTL)
-
- # libtool option to control which symbols are exported
- # right now, symbols starting with _ are not exported
-@@ -150,8 +152,8 @@
-
- if test "$enable_debug" = "yes"; then
- AC_DEFINE(ENABLE_DEBUG,1,[Define this to enable the debug facility in libscim])
-- CFLAGS="$CFLAGS -g -Wall -Wmissing-declarations -Wreturn-type"
-- CXXFLAGS="$CXXFLAGS -g -Wall -Wshadow -Woverloaded-virtual -Wreturn-type"
-+ CFLAGS="$CFLAGS -g"
-+ CXXFLAGS="$CXXFLAGS -g"
- else
- enable_debug=no
- fi
--- a/specs/patches/scim-canna-1.0.0-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
---- configure.ac 2006-02-06 11:37:05.000000000 +0800
-+++ configure.ac 2007-12-27 14:02:20.214963212 +0800
-@@ -25,7 +25,7 @@
-
- # Init gettext
- ALL_LINGUAS="ja"
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-
- GETTEXT_PACKAGE=scim-canna
- AC_SUBST(GETTEXT_PACKAGE)
---- Makefile.am 2005-06-08 22:13:06.000000000 +0800
-+++ Makefile.am 2007-12-27 14:02:33.123476198 +0800
-@@ -1,5 +1,5 @@
--SUBDIRS = intl po m4 src data
-+SUBDIRS = po m4 src data
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-
- EXTRA_DIST = config.rpath
-diff -ur src/canna_jrkanji.cpp src/canna_jrkanji.cpp
---- src/canna_jrkanji.cpp 2006-02-02 11:04:11.000000000 +0800
-+++ src/canna_jrkanji.cpp 2007-12-27 09:24:58.891587554 +0800
-@@ -318,9 +318,9 @@
- unsigned int cur_len)
- {
- // cut the string
-- char left_str[cur_pos + 1];
-- char cur_str[cur_len + 1];
-- char right_str[len - cur_pos - cur_len + 1];
-+ char *left_str = new char[cur_pos + 1];
-+ char *cur_str = new char[cur_len + 1];
-+ char *right_str = new char[len - cur_pos - cur_len + 1];
- strncpy (left_str, str, cur_pos);
- left_str[cur_pos] = '\0';
- strncpy (cur_str, (const char *) (str + cur_pos), cur_len);
-@@ -343,6 +343,10 @@
- attr.set_value (SCIM_ATTR_DECORATE_REVERSE);
- attr_list.push_back (attr);
-
-+ delete[] left_str;
-+ delete[] cur_str;
-+ delete[] right_str;
-+
- return left.length ();
- }
-
-@@ -480,12 +484,13 @@
- if (m_enabled) {
- int max_mode_len = jrKanjiControl(m_context_id,
- KC_QUERYMAXMODESTR, 0);
-- unsigned char current_mode[max_mode_len];
-+ unsigned char *current_mode = new unsigned char[max_mode_len];
- jrKanjiControl(m_context_id, KC_QUERYMODE, (char *) current_mode);
- WideString dest;
- m_iconv.convert (dest, (const char *) current_mode);
- m_properties[0].set_label (utf8_wcstombs(dest).c_str());
- m_canna->register_properties (m_properties);
-+ delete[] current_mode;
- } else {
- m_properties[0].set_label (_("[Off]"));
- m_canna->register_properties (m_properties);
--- a/specs/patches/scim-chewing-0.3.1-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-Index: src/scim_color_button.cpp
-===================================================================
---- src/scim_color_button.cpp (revision 794)
-+++ src/scim_color_button.cpp (working copy)
-@@ -99,6 +99,9 @@
- (GInstanceInitFunc) scim_color_button_init,
- };
-
-+ type = g_type_from_name ("ScimColorButton");
-+
-+ if (!type)
- type = g_type_register_static (GTK_TYPE_DRAWING_AREA,
- "ScimColorButton",
- &info, (GTypeFlags) 0);
--- a/specs/patches/scim-hangul-0.3.1-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-Index: Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim-hangul/Makefile.am,v
-retrieving revision 1.5
-diff -u -p -r1.5 Makefile.am
---- Makefile.am 1 Nov 2005 14:46:00 -0000 1.5
-+++ Makefile.am 11 May 2007 05:54:26 -0000
-@@ -33,7 +33,7 @@ SKIM_SUBDIR=skim
- endif
-
- AUTOMAKE_OPTIONS = gnu
--SUBDIRS = m4 intl src data po $(SKIM_SUBDIR)
-+SUBDIRS = src data po $(SKIM_SUBDIR)
- ## @start 1
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in $(AUX_DIST)
-
-@@ -45,7 +45,7 @@ ACLOCAL = aclocal -I $(ac_aux_dir)
- ## @start 2
- ## docdir = $(top_builddir)/doc
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-
- .PHONY: changelog
-
-Index: bootstrap
-===================================================================
-RCS file: /cvsroot/scim/scim-hangul/bootstrap,v
-retrieving revision 1.2
-diff -u -p -r1.2 bootstrap
---- bootstrap 23 Mar 2005 18:13:55 -0000 1.2
-+++ bootstrap 11 May 2007 05:54:26 -0000
-@@ -20,12 +20,13 @@
- #! /bin/sh
-
- set -x
-+glib-gettextize --force
- aclocal ${ACLOCAL_FLAGS}
- autoheader
- libtoolize -c --automake
- automake --add-missing --copy --include-deps
- autoconf
--cd skim
--./bootstrap
--cd ..
-+#cd skim
-+#./bootstrap
-+#cd ..
- ## @end 1
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/scim/scim-hangul/configure.ac,v
-retrieving revision 1.12
-diff -u -p -r1.12 configure.ac
---- configure.ac 6 Jan 2007 16:23:33 -0000 1.12
-+++ configure.ac 11 May 2007 05:54:26 -0000
-@@ -23,7 +23,9 @@ AM_CONFIG_HEADER([config.h])
-
- # Init gettext
- ALL_LINGUAS="de fr ja ko pa zh_CN"
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+LTLIBINTL=
-+AC_SUBST(LTLIBINTL)
-
- GETTEXT_PACKAGE=scim-hangul
- AC_SUBST(GETTEXT_PACKAGE)
--- a/specs/patches/scim-hangul-0.3.2-fix-mkinstalldirs-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-AM_MKINSTALLDIRS macro is not defined in current autotools.
-According to the page
- http://osdir.com/ml/lib.gnulib.bugs/2005-04/msg00009.html
-the undocumented macro is not needed any more
-
-diff -ruN scim-hangul-0.3.2.orig/configure.ac scim-hangul-0.3.2/configure.ac
---- scim-hangul-0.3.2.orig/configure.ac 2011-01-13 12:13:16.325617939 +0100
-+++ scim-hangul-0.3.2/configure.ac 2011-01-13 12:14:28.479058420 +0100
-@@ -26,7 +26,6 @@
- AM_GLIB_GNU_GETTEXT
- LTLIBINTL=
- AC_SUBST(LTLIBINTL)
--AM_MKINSTALLDIRS
-
- GETTEXT_PACKAGE=scim-hangul
- AC_SUBST(GETTEXT_PACKAGE)
--- a/specs/patches/scim-hangul-0.3.2-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-diff -ur Makefile.am Makefile.am
---- Makefile.am 2007-12-30 13:27:09.000000000 +0800
-+++ Makefile.am 2007-12-31 09:48:13.398894618 +0800
-@@ -39,7 +39,7 @@
- endif
-
- AUTOMAKE_OPTIONS = gnu
--SUBDIRS = m4 intl src data po $(SKIM_SUBDIR)
-+SUBDIRS = m4 src data po $(SKIM_SUBDIR)
- ## @start 1
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in $(AUX_DIST)
-
-@@ -51,7 +51,7 @@
- ## @start 2
- ## docdir = $(top_builddir)/doc
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-
- .PHONY: ChangeLog
-
-diff -ur configure.ac configure.ac
---- configure.ac 2007-12-30 15:19:29.000000000 +0800
-+++ configure.ac 2007-12-31 09:47:35.391321798 +0800
-@@ -23,7 +23,9 @@
-
- # Init gettext
- ALL_LINGUAS="de fr ja ko nl pa zh_CN"
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+LTLIBINTL=
-+AC_SUBST(LTLIBINTL)
- AM_MKINSTALLDIRS
-
- GETTEXT_PACKAGE=scim-hangul
---- bootstrap 2007-12-30 15:05:15.000000000 +0800
-+++ bootstrap 2007-12-31 10:15:08.470987305 +0800
-@@ -20,12 +20,13 @@
- #! /bin/sh
-
- set -x
--aclocal -I ./m4 ${ACLOCAL_FLAGS}
-+glib-gettextize --force
-+aclocal ${ACLOCAL_FLAGS}
- autoheader
- libtoolize -c --automake
- automake --add-missing --copy --include-deps
- autoconf
--cd skim
--./bootstrap
--cd ..
-+#cd skim
-+#./bootstrap
-+#cd ..
- ## @end 1
--- a/specs/patches/scim-input-pad-0.1.1-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-diff -ur Makefile.am Makefile.am
---- Makefile.am 2005-03-07 23:27:56.000000000 +0800
-+++ Makefile.am 2007-12-26 17:34:10.642251217 +0800
-@@ -32,7 +32,7 @@
- scim-input-pad.spec
-
- AUTOMAKE_OPTIONS = gnu
--SUBDIRS = intl m4 po src data
-+SUBDIRS = m4 po src data
-
- MAINTAINERCLEANFILES = Makefile.in \
- aclocal.m4 \
-@@ -45,4 +45,4 @@
- CLEANFILES = *.bak
-
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-diff -ur bootstrap bootstrap
---- bootstrap 2005-03-06 18:06:27.000000000 +0800
-+++ bootstrap 2007-12-26 17:33:54.768211690 +0800
-@@ -20,6 +20,7 @@
- #! /bin/sh
-
- set -x
-+glib-gettextize --force
- aclocal -I m4
- autoheader
- libtoolize -c --automake
-diff -ur configure.ac configure.ac
---- configure.ac 2005-12-06 11:06:26.000000000 +0800
-+++ configure.ac 2007-12-26 17:35:10.827168661 +0800
-@@ -35,7 +35,9 @@
-
- # Init gettext
- ALL_LINGUAS="zh_CN zh_TW pa ja de fr it"
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+LTLIBINTL=
-+AC_SUBST(LTLIBINTL)
-
- # Check intltool
- IT_PROG_INTLTOOL([0.33], [no-xml])
-diff -ur src/Makefile.am src/Makefile.am
---- src/Makefile.am 2005年 3月 21日 一 22:44:27
-+++ src/Makefile.am 2007年 12月 26日 三 19:20:41
-@@ -17,7 +17,6 @@
- libscim_input_pad_la_LDFLAGS = -version-info $(SCIM_INPUT_PAD_CURRENT):$(SCIM_INPUT_PAD_REVISION):$(SCIM_INPUT_PAD_AGE) \
- -export-dynamic \
- -rpath $(libdir) \
-- @LIBTOOL_EXPORT_OPTIONS@ \
- @LTLIBINTL@ \
- @SCIM_LIBS@
-
--- a/specs/patches/scim-menu-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
---- scim-1.4.7.org.org/extras/setup/scim-setup.desktop.in 2011-06-30 15:26:30.476939500 +0900
-+++ scim-1.4.7/extras/setup/scim-setup.desktop.in 2011-06-30 15:26:47.010042450 +0900
-@@ -1,6 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=SCIM Input Method Setup
-+_Name=Input Method - SCIM
- _Comment=Setup utility for Smart Common Input Method platform
- Exec=scim-setup
- Icon=scim-setup.png
-diff -ruNa scim-1.4.7.org/po/de.po scim-1.4.7/po/de.po
---- scim-1.4.7.org/po/de.po 2007-06-26 23:31:56.000000000 +0900
-+++ scim-1.4.7/po/de.po 2011-06-30 18:01:52.310902400 +0900
-@@ -1383,6 +1383,9 @@
- msgid "The orientation of the tray."
- msgstr "Die Ausrichtung des Systemabschnitts der Kontrollleiste."
-
-+msgid "Input Method - SCIM"
-+msgstr "Eingabemethode - SCIM"
-+
- #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
- #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-
-diff -ruNa scim-1.4.7.org/po/fr.po scim-1.4.7/po/fr.po
---- scim-1.4.7.org/po/fr.po 2007-06-26 23:31:56.000000000 +0900
-+++ scim-1.4.7/po/fr.po 2011-06-30 18:01:53.139799600 +0900
-@@ -1369,6 +1369,9 @@
- msgid "The orientation of the tray."
- msgstr "Orientation du tiroir."
-
-+msgid "Input Method - SCIM"
-+msgstr "Méthode d'entrée - SCIM"
-+
- #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
- #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-
-diff -ruNa scim-1.4.7.org/po/it.po scim-1.4.7/po/it.po
---- scim-1.4.7.org/po/it.po 2007-06-26 23:31:56.000000000 +0900
-+++ scim-1.4.7/po/it.po 2011-06-30 18:01:53.275341150 +0900
-@@ -1378,6 +1378,9 @@
- msgid "The orientation of the tray."
- msgstr "L'orientazione del vassoio."
-
-+msgid "Input Method - SCIM"
-+msgstr "Metodo di input - SCIM"
-+
- #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
- #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-
-diff -ruNa scim-1.4.7.org/po/ja.po scim-1.4.7/po/ja.po
---- scim-1.4.7.org/po/ja.po 2007-06-26 23:31:56.000000000 +0900
-+++ scim-1.4.7/po/ja.po 2011-06-30 18:01:52.195213500 +0900
-@@ -1357,6 +1357,9 @@
- msgid "The orientation of the tray."
- msgstr "トレイの方向"
-
-+msgid "Input Method - SCIM"
-+msgstr "入力方式 - SCIM"
-+
- #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
- #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-
-diff -ruNa scim-1.4.7.org/po/ko.po scim-1.4.7/po/ko.po
---- scim-1.4.7.org/po/ko.po 2007-06-26 23:31:56.000000000 +0900
-+++ scim-1.4.7/po/ko.po 2011-06-30 18:01:52.970242750 +0900
-@@ -1325,6 +1325,9 @@
- msgid "The orientation of the tray."
- msgstr "트레이의 방향."
-
-+msgid "Input Method - SCIM"
-+msgstr "입력기 - SCIM"
-+
- #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
- #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-
-diff -ruNa scim-1.4.7.org/po/zh_CN.po scim-1.4.7/po/zh_CN.po
---- scim-1.4.7.org/po/zh_CN.po 2007-06-26 23:31:56.000000000 +0900
-+++ scim-1.4.7/po/zh_CN.po 2011-06-30 18:01:51.960709150 +0900
-@@ -1309,6 +1309,9 @@
- msgid "The orientation of the tray."
- msgstr ""
-
-+msgid "Input Method - SCIM"
-+msgstr "输入法 - SCIM"
-+
- #~ msgid "En"
- #~ msgstr "英"
-
-diff -ruNa scim-1.4.7.org/po/zh_TW.po scim-1.4.7/po/zh_TW.po
---- scim-1.4.7.org/po/zh_TW.po 2007-06-26 23:31:56.000000000 +0900
-+++ scim-1.4.7/po/zh_TW.po 2011-06-30 18:01:51.718186600 +0900
-@@ -1310,6 +1310,9 @@
- msgid "The orientation of the tray."
- msgstr "狀態列的方位。"
-
-+msgid "Input Method - SCIM"
-+msgstr "輸入法 - SCIM"
-+
- #~ msgid "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
- #~ msgstr "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR"
-
--- a/specs/patches/scim-no-default-imm-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- extras/gtk2_immodule/imscim.cpp.orig 2008-11-27 21:20:10.970748530 +0800
-+++ extras/gtk2_immodule/imscim.cpp 2008-11-27 21:22:46.635884347 +0800
-@@ -33,7 +33,7 @@ static const GtkIMContextInfo scim_info
- "SCIM Input Method", /* Human readable name */
- "scim", /* Translation domain */
- SCIM_LOCALEDIR, /* Dir for bindtextdomain (not strictly needed for "gtk+") */
-- "ja:ko:zh" /* Languages for which this module is the default */
-+ "" /* Languages for which this module is the default */
- };
-
- static const GtkIMContextInfo *info_list[] = {
--- a/specs/patches/scim-pinyin-0.5.91-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-Index: Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim-pinyin/Makefile.am,v
-retrieving revision 1.6
-diff -u -p -r1.6 Makefile.am
---- Makefile.am 6 Aug 2005 17:03:54 -0000 1.6
-+++ Makefile.am 8 May 2007 18:04:23 -0000
-@@ -33,11 +33,11 @@ SKIM_SUBDIR=skim
- endif
-
- AUTOMAKE_OPTIONS = gnu
--SUBDIRS = m4 src data intl po $(SKIM_SUBDIR)
-+SUBDIRS = src data po $(SKIM_SUBDIR)
-
- ## @start 1
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in $(AUX_DIST)
-
- CLEANFILES = *.bak src/*.bak
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-Index: bootstrap
-===================================================================
-RCS file: /cvsroot/scim/scim-pinyin/bootstrap,v
-retrieving revision 1.2
-diff -u -p -r1.2 bootstrap
---- bootstrap 5 Mar 2005 21:23:44 -0000 1.2
-+++ bootstrap 18 May 2007 09:20:59 -0000
-@@ -20,12 +20,13 @@
- #! /bin/sh
-
- set -x
--aclocal -I m4
-+intltoolize --force
-+aclocal
- autoheader
- libtoolize -c --automake --force
- automake --add-missing --copy --include-deps
- autoconf
--cd skim
--./bootstrap
--cd ..
-+#cd skim
-+#./bootstrap
-+#cd ..
- ## @end 1
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/scim/scim-pinyin/configure.ac,v
-retrieving revision 1.10
-diff -u -p -r1.10 configure.ac
---- configure.ac 12 Aug 2005 01:09:34 -0000 1.10
-+++ configure.ac 8 May 2007 18:04:23 -0000
-@@ -15,7 +15,12 @@ AM_CONFIG_HEADER([config.h])
-
- # Init gettext
- ALL_LINGUAS="zh_CN zh_TW ko ja de fr it"
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+LTLIBINTL=
-+AC_SUBST(LTLIBINTL)
-+
-+# Check intltool
-+IT_PROG_INTLTOOL([0.33], [no-xml])
-
- # Init libtool
- AC_LIBTOOL_WIN32_DLL
-Index: src/scim_pinyin.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim-pinyin/src/scim_pinyin.cpp,v
-retrieving revision 1.3
-diff -u -p -r1.3 scim_pinyin.cpp
---- src/scim_pinyin.cpp 8 Aug 2005 06:11:16 -0000 1.3
-+++ src/scim_pinyin.cpp 8 May 2007 18:04:26 -0000
-@@ -1867,7 +1867,7 @@ PinyinTable::find_keys (PinyinKeyVector
-
- vec.clear ();
-
-- std::pair<ReversePinyinMap::const_iterator, ReversePinyinMap::const_iterator> result =
-+ std::pair<ReversePinyinMap::iterator, ReversePinyinMap::iterator> result =
- m_revmap.equal_range (code);
-
- for (ReversePinyinMap::const_iterator i = result.first; i != result.second; i++)
-Index: src/scim_pinyin.h
-===================================================================
-RCS file: /cvsroot/scim/scim-pinyin/src/scim_pinyin.h,v
-retrieving revision 1.3
-diff -u -p -r1.3 scim_pinyin.h
---- src/scim_pinyin.h 6 Aug 2005 15:19:01 -0000 1.3
-+++ src/scim_pinyin.h 8 May 2007 18:04:27 -0000
-@@ -975,7 +975,7 @@ class PinyinTable
- typedef std::multimap<ucs4_t, PinyinKey> ReversePinyinMap;
- #endif
-
-- typedef std::pair<ucs4_t,PinyinKey> ReversePinyinPair;
-+ typedef std::pair<const ucs4_t,PinyinKey> ReversePinyinPair;
- typedef std::vector<PinyinEntry> PinyinEntryVector;
-
- /**
--- a/specs/patches/scim-tables-0.5.7-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-Index: Makefile.am
-===================================================================
-RCS file: /cvsroot/scim/scim-tables/Makefile.am,v
-retrieving revision 1.12
-diff -u -p -r1.12 Makefile.am
---- Makefile.am 5 Dec 2005 07:13:12 -0000 1.12
-+++ Makefile.am 11 May 2007 06:11:18 -0000
-@@ -30,13 +30,13 @@ if SCIM_TABLES_ENABLE_SKIM_SUPPORT
- SKIM_SUBDIR=skim
- endif
-
--SUBDIRS = docs intl icons m4 po src tables $(SKIM_SUBDIR)
-+SUBDIRS = docs icons po src tables $(SKIM_SUBDIR)
-
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST)
-
- CLEANFILES = *.bak
-
--ACLOCAL_AMFLAGS = -I m4
-+ACLOCAL_AMFLAGS =
-
- .PHONY: update-ChangeLog
-
-Index: bootstrap
-===================================================================
-RCS file: /cvsroot/scim/scim-tables/bootstrap,v
-retrieving revision 1.4
-diff -u -p -r1.4 bootstrap
---- bootstrap 11 Mar 2005 01:27:53 -0000 1.4
-+++ bootstrap 11 May 2007 06:11:18 -0000
-@@ -20,12 +20,13 @@
- #! /bin/sh
-
- set -x
--aclocal -I m4
-+glib-gettextize --force
-+aclocal
- autoheader
- libtoolize -c --automake
- automake --add-missing --copy --include-deps
- autoconf
--cd skim
--./bootstrap
--cd ..
-+#cd skim
-+#./bootstrap
-+#cd ..
- ## @end 1
-Index: configure.ac
-===================================================================
-RCS file: /cvsroot/scim/scim-tables/configure.ac,v
-retrieving revision 1.52
-diff -u -p -r1.52 configure.ac
---- configure.ac 8 Oct 2006 16:13:52 -0000 1.52
-+++ configure.ac 11 May 2007 06:11:18 -0000
-@@ -16,7 +16,9 @@ AM_CONFIG_HEADER([config.h])
-
- # Init gettext
- ALL_LINGUAS="zh_CN zh_TW ja ko de fr it pa"
--AM_GNU_GETTEXT
-+AM_GLIB_GNU_GETTEXT
-+LTLIBINTL=
-+AC_SUBST(LTLIBINTL)
-
- AC_LIBTOOL_WIN32_DLL
- AC_LIBTOOL_DLOPEN
-Index: src/scim_generic_table.cpp
-===================================================================
-RCS file: /cvsroot/scim/scim-tables/src/scim_generic_table.cpp,v
-retrieving revision 1.10
-diff -u -p -r1.10 scim_generic_table.cpp
---- src/scim_generic_table.cpp 12 Jan 2006 08:43:29 -0000 1.10
-+++ src/scim_generic_table.cpp 11 May 2007 06:11:19 -0000
-@@ -902,7 +902,7 @@ GenericTableContent::init (const Generic
- GenericTableContent::~GenericTableContent ()
- {
- if (m_mmapped) {
-- munmap (m_mmapped_ptr, m_mmapped_size);
-+ munmap ((char*)m_mmapped_ptr, m_mmapped_size);
- } else if (m_content) {
- delete [] m_content;
- }
-@@ -1548,7 +1548,7 @@ void
- GenericTableContent::clear ()
- {
- if (m_mmapped) {
-- munmap (m_mmapped_ptr, m_mmapped_size);
-+ munmap ((char*)m_mmapped_ptr, m_mmapped_size);
- } else if (m_content) {
- delete [] m_content;
- }
--- a/specs/patches/scim-thai-0.1.0-on-nv-ss11-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-Index: configure.ac
-===================================================================
-RCS file: /home/cvs/software/scim-thai/configure.ac,v
-retrieving revision 1.6
-diff -u -p -r1.6 configure.ac
---- configure.ac 20 Jul 2006 05:49:51 -0000 1.6
-+++ configure.ac 17 Dec 2007 08:41:00 -0000
-@@ -9,7 +9,7 @@ AC_CONFIG_HEADER([config.h])
- AM_INIT_AUTOMAKE
-
- # gettext
--AM_GNU_GETTEXT([external])
-+AM_GLIB_GNU_GETTEXT([external])
- GETTEXT_PACKAGE=scim-thai
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain])
--- a/specs/patches/scim-with-solaris-iconv-patch.diff Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
---- scim-1.4.7.orig/src/scim_iconv.cpp 2007�� 10�� 9�� �� 00:42:09
-+++ scim-1.4.7/src/scim_iconv.cpp 2007�� 12�� 29�� �� 16:30:48
-@@ -97,11 +97,11 @@
- iconv_t new_iconv_to_unicode;
-
- if (scim_is_little_endian ()) {
-- new_iconv_from_unicode = iconv_open (encoding.c_str (), "UCS-4LE");
-- new_iconv_to_unicode = iconv_open ("UCS-4LE", encoding.c_str ());
-+ new_iconv_from_unicode = iconv_open (encoding.c_str (), "UCS-2LE");
-+ new_iconv_to_unicode = iconv_open ("UCS-2LE", encoding.c_str ());
- } else {
-- new_iconv_from_unicode = iconv_open (encoding.c_str (), "UCS-4BE");
-- new_iconv_to_unicode = iconv_open ("UCS-4BE", encoding.c_str ());
-+ new_iconv_from_unicode = iconv_open (encoding.c_str (), "UCS-2BE");
-+ new_iconv_to_unicode = iconv_open ("UCS-2BE", encoding.c_str ());
- }
-
- if (new_iconv_from_unicode == (iconv_t) -1 ||
-@@ -144,17 +144,23 @@
- size_t src_buf_size = 0;
- size_t ret;
-
-+ ucs2_t *ucs2src = new ucs2_t[src_len];
-+ for (int i = 0; i < src_len; i++) {
-+ ucs2src[i] = (ucs2_t)src[i];
-+ }
-+
- iconv (m_impl->m_iconv_from_unicode, 0, &src_buf_size, 0, &dest_buf_size);
-
- char *dest_buf_ptr = dest_buf;
-- ICONV_CONST char *src_buf_ptr = (ICONV_CONST char*) src;
-+ ICONV_CONST char *src_buf_ptr = (ICONV_CONST char*) ucs2src;
-
- dest_buf_size = SCIM_MAX_BUFSIZE * MB_LEN_MAX;
-- src_buf_size = src_len * sizeof (ucs4_t);
-+ src_buf_size = src_len * sizeof (ucs2_t);
-
- ret = iconv (m_impl->m_iconv_from_unicode, &src_buf_ptr, &src_buf_size, &dest_buf_ptr, &dest_buf_size);
- dest.assign (dest_buf, dest_buf_ptr);
-
-+ delete[] ucs2src;
- return ret != (size_t) -1;
- }
-
-@@ -172,18 +178,24 @@
- char dest_buf [SCIM_MAX_BUFSIZE * MB_LEN_MAX];
- size_t src_buf_size = 0;
- size_t dest_buf_size = 0;
-+
- size_t ret;
-+ ucs2_t *ucs2src = new ucs2_t[src_len];
-+ for (int i = 0; i < src_len; i++) {
-+ ucs2src[i] = (ucs2_t)src[i];
-+ }
-
- iconv (m_impl->m_iconv_from_unicode, 0, &src_buf_size, 0, &dest_buf_size);
-
- char *dest_buf_ptr = dest_buf;
-- ICONV_CONST char *src_buf_ptr = (ICONV_CONST char*) src;
-+ ICONV_CONST char *src_buf_ptr = (ICONV_CONST char*) ucs2src;
-
-- src_buf_size = src_len * sizeof (ucs4_t);
-+ src_buf_size = src_len * sizeof (ucs2_t);
- dest_buf_size = SCIM_MAX_BUFSIZE * MB_LEN_MAX;
-
- ret = iconv (m_impl->m_iconv_from_unicode, &src_buf_ptr, &src_buf_size, &dest_buf_ptr, &dest_buf_size);
-
-+ delete[] ucs2src;
- return ret != (size_t) -1;
- }
-
-@@ -199,20 +211,30 @@
- if (m_impl->m_iconv_to_unicode == (iconv_t) -1) return false;
-
- ucs4_t dest_buf [SCIM_MAX_BUFSIZE];
-+ ucs2_t ucs2_dest_buf [SCIM_MAX_BUFSIZE];
-
- size_t dest_buf_size = 0;
- size_t src_buf_size = 0;
- size_t ret;
-+ int i;
-
- iconv (m_impl->m_iconv_to_unicode, 0, &src_buf_size, 0, &dest_buf_size);
-
-- char *dest_buf_ptr = (char*) dest_buf;
-+ char *dest_buf_ptr = (char*) ucs2_dest_buf;
- ICONV_CONST char *src_buf_ptr = (ICONV_CONST char*) src;
-
-- dest_buf_size = SCIM_MAX_BUFSIZE * sizeof (ucs4_t);
-+ dest_buf_size = SCIM_MAX_BUFSIZE * sizeof (ucs2_t);
- src_buf_size = src_len;
-
- ret = iconv (m_impl->m_iconv_to_unicode, &src_buf_ptr, &src_buf_size, &dest_buf_ptr, &dest_buf_size);
-+
-+ size_t dest_cnt = (SCIM_MAX_BUFSIZE * sizeof (ucs2_t) - dest_buf_size)
-+ / sizeof (ucs2_t);
-+
-+ for (i = 0; i < dest_cnt; i++) {
-+ dest_buf[i] = (ucs4_t)ucs2_dest_buf[i] & 0x0000ffff;
-+ }
-+ dest_buf_ptr = (char *)&dest_buf[i];
- dest.assign (dest_buf, (ucs4_t*) dest_buf_ptr);
-
- return ret != (size_t) -1;
-@@ -235,16 +257,21 @@
- size_t dest_buf_size = 0;
- size_t ret;
-
-- iconv (m_impl->m_iconv_from_unicode, 0, &src_buf_size, 0, &dest_buf_size);
-+ ucs2_t *ucs2src = new ucs2_t[src_len];
-+ for (int i = 0; i < src_len; i++) {
-+ ucs2src[i] = (ucs2_t)src[i];
-+ }
-+ iconv (m_impl->m_iconv_to_unicode, 0, &src_buf_size, 0, &dest_buf_size);
-
- char *dest_buf_ptr = (char*) dest_buf;
-- ICONV_CONST char *src_buf_ptr = (ICONV_CONST char*) src;
-+ ICONV_CONST char *src_buf_ptr = (ICONV_CONST char*) ucs2src;
-
- src_buf_size = src_len;
-- dest_buf_size = SCIM_MAX_BUFSIZE * sizeof (ucs4_t);
-+ dest_buf_size = SCIM_MAX_BUFSIZE * sizeof (ucs2_t);
-
- ret = iconv (m_impl->m_iconv_to_unicode, &src_buf_ptr, &src_buf_size, &dest_buf_ptr, &dest_buf_size);
-
-+ delete[] ucs2src;
- return ret != (size_t) -1;
- }
-
---- scim-1.4.7.orig/src/scim_types.h.in 2007�� 10�� 9�� �� 00:42:09
-+++ scim-1.4.7/src/scim_types.h.in 2007�� 12�� 29�� �� 16:30:48
-@@ -50,6 +54,7 @@
- #else
- typedef uint32 ucs4_t;
- #endif
-+typedef uint16 ucs2_t;
-
- typedef std::basic_string<char> String;
- typedef std::basic_string<ucs4_t> WideString;
--- a/specs/scim-anthy.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-%include Solaris.inc
-
-%define src_name scim-anthy
-%define src_url http://iij.dl.sourceforge.jp/scim-imengine/25404
-
-Summary: Smart Common Input Method Framework - libanthy IMEngine
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim-anthy
-Version: 1.2.4
-Release: 1
-License: GPL
-Source: %{src_url}/%{src_name}-%{version}.tar.gz
-Patch1: scim-anthy-%{version}-on-nv-ss11-patch.diff
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-SUNW_PKGLIST: SUNWscim
-SUNW_LOC: ja,ja_JP.PCK,ja_JP.UTF-8
-SUNW_Copyright: %{src_name}.copyright
-IPS_Package_Name: system/input-method/scim/anthy
-IPS_Component_Version: %{version}
-Meta(info.classification): %{ipsclass_sys_i18n}
-
-%include default-depend.inc
-Requires: SUNWscim
-Requires: SUNWlibanthy
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWscim-devel
-BuildRequires: SUNWlibanthy-devel
-
-%prep
-%setup -q -n %{src_name}-%{version}
-%patch1 -p0
-
-%build
-glib-gettextize --force
-aclocal
-autoconf
-autoheader
-automake --add-missing
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --disable-debug
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_libdir}/scim-1.0/*
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (0755, root, other) %{_datadir}/locale
-%{_datadir}/scim/*
--- a/specs/scim-bridge.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-%include Solaris.inc
-
-%define src_name scim-bridge
-%define src_url http://jaist.dl.sourceforge.net/sourceforge/scim
-
-Summary: Smart Common Input Method Framework - Bridge
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim-bridge
-Version: 0.4.14
-Release: 1
-License: GPL/LGPL
-Source: %{src_url}/%{src_name}-%{version}.tar.gz
-Patch1: scim-bridge-%{version}-on-nv-ss11-patch.diff
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-SUNW_Copyright: %{src_name}.copyright
-
-%include default-depend.inc
-Requires: SUNWscim
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWscim-devel
-
-%prep
-%setup -q -n %{src_name}-%{version}
-%patch1 -p0
-
-%ifarch amd64 sparcv9
-cd ..
-rm -rf %{src_name}-%{version}-64
-cp -pr %{src_name}-%{version} %{src_name}-%{version}-64
-%endif
-
-%build
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags -DMSG_NOSIGNAL=0"
-export CXXFLAGS="-DMSG_NOSIGNAL=0"
-export LDFLAGS="%_ldflags -lsocket"
-./bootstrap
-intltoolize --force --copy
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --disable-debug \
- --disable-qt3-immodule \
- --disable-qt4-immodule \
- --disable-documents
-make
-
-%ifarch amd64 sparcv9
-cd ..
-cd %{src_name}-%{version}-64
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags64 -DMSG_NOSIGNAL=0"
-export CXXFLAGS="%cxx_optflags64 -DMSG_NOSIGNAL=0"
-export LDFLAGS="%_ldflags -lsocket -L%{_libdir}/%{_arch64} -R%{_libdir}/%{_arch64} -lscim-1.0"
-perl -pi -e 's/GTK_LIBDIR=.*PKG_CONFIG.*$//g' configure.ac
-export GTK_LIBDIR=%{_libdir}/%{_arch64}
-./bootstrap
-intltoolize --force --copy
-./configure --prefix=%{_prefix}/%{_arch64} \
- --bindir=%{_bindir}/%{_arch64} \
- --libdir=%{_libdir}/%{_arch64} \
- --sysconfdir=%{_sysconfdir}/%{_arch64} \
- --disable-debug \
- --disable-qt3-immodule \
- --disable-qt4-immodule \
- --disable-documents
-make
-%endif
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-
-%ifarch amd64 sparcv9
-cd ..
-cd %{src_name}-%{version}-64
-DESTDIR=${RPM_BUILD_ROOT} make install
-rm -rf ${RPM_BUILD_ROOT}/usr/%{_arch64}
-rm -rf ${RPM_BUILD_ROOT}/usr/bin/%{_arch64}
-%endif
-
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%post
-#%include update-gtk-immodules.script
-
-%postun
-#%include update-gtk-immodules.script
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_bindir}/*
-%{_libdir}/gtk-2.0/*
-
-%ifarch amd64 sparcv9
-%{_libdir}/%{_arch64}/gtk-2.0/*
-%endif
-
--- a/specs/scim-canna.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-%include Solaris.inc
-
-%define src_name scim-canna
-
-Summary: Smart Common Input Method Framework - libcanna IMEngine
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim-canna
-Version: 1.0.0
-Release: 1
-License: GPL
-Source: %{src_name}-%{version}.tar.gz
-Patch1: scim-canna-1.0.0-on-nv-ss11-patch.diff
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-
-%include default-depend.inc
-Requires: SUNWgnome-base-libs
-Requires: SUNWscim
-Requires: SUNWlibcanna
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWscim-devel
-BuildRequires: SUNWlibcanna-devel
-
-%prep
-%setup -q -n %{src_name}-%{version}
-%patch1 -p0
-
-%build
-glib-gettextize --force
-aclocal
-autoconf
-autoheader
-automake --add-missing
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-export LDFLAGS="%_ldflags -lsocket"
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --disable-debug
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_libdir}/*
-#%{_libdir}/scim-1.0/*
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (0755, root, other) %{_datadir}/locale
-%{_datadir}/scim/*
--- a/specs/scim-chewing.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-%include Solaris.inc
-
-%define src_name scim-chewing
-%define src_url http://chewing.csie.net/download/scim/
-
-Summary: Smart Common Input Method Framework - libchewing IMEngine
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim-chewing
-Version: 0.3.3
-Release: 1
-License: GPL
-Source: %{src_url}/%{src_name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-SUNW_PKGLIST: SUNWscim
-SUNW_LOC: zh_TW,zh_TW.UTF-8
-SUNW_Copyright: %{src_name}.copyright
-IPS_Package_Name: system/input-method/scim/chewing
-IPS_Component_Version: 0.3.1
-Meta(info.classification): %{ipsclass_sys_i18n}
-
-
-%include default-depend.inc
-Requires: SUNWscim
-Requires: SUNWlibchewing
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWscim-devel
-BuildRequires: SUNWlibchewing-devel
-
-%prep
-%setup -q -n %{src_name}-%{version}
-
-%build
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-glib-gettextize --force --copy
-intltoolize --force --copy
-libtoolize --force --copy
-aclocal
-autoconf
-automake --add-missing
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --disable-debug
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_libdir}/scim-1.0/*
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (0755, root, other) %{_datadir}/locale
-%{_datadir}/scim/*
--- a/specs/scim-hangul.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-%include Solaris.inc
-
-%define src_name scim-hangul
-%define src_url http://jaist.dl.sourceforge.net/sourceforge/scim
-
-Summary: Smart Common Input Method Framework - libhangul IMEngine
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim-hangul
-Version: 0.3.2
-Release: 1
-License: GPL
-Source: %{src_url}/%{src_name}-%{version}.tar.gz
-Patch1: scim-hangul-%{version}-on-nv-ss11-patch.diff
-Patch2: scim-hangul-%{version}-fix-mkinstalldirs-patch.diff
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-SUNW_PKGLIST: SUNWscim
-SUNW_LOC: ko,ko.UTF-8
-SUNW_Copyright: %{src_name}.copyright
-IPS_Package_Name: system/input-method/scim/hangul
-IPS_Component_Version: %{version}
-Meta(info.classification): %{ipsclass_sys_i18n}
-
-
-%include default-depend.inc
-Requires: SUNWscim
-Requires: SUNWlibhangul
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWscim-devel
-BuildRequires: SUNWlibhangul-devel
-
-%prep
-%setup -q -n %{src_name}-%{version}
-%patch1 -p0
-%patch2 -p1
-
-%build
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-./bootstrap
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --disable-debug
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_libdir}/scim-1.0/*
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (0755, root, other) %{_datadir}/locale
-%{_datadir}/scim/*
-
--- a/specs/scim-input-pad.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-%include Solaris.inc
-
-%define src_name scim-input-pad
-%define src_url http://jaist.dl.sourceforge.net/sourceforge/scim
-
-Summary: Smart Common Input Method Framework - Input Pad
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim-input-pad
-Version: 0.1.1
-Release: 1
-License: GPL
-Source: %{src_name}-%{version}.tar.gz
-Patch1: scim-input-pad-%{version}-on-nv-ss11-patch.diff
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-
-%include default-depend.inc
-Requires: SUNWgnome-base-libs
-Requires: SUNWscim
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWscim-devel
-
-%prep
-%setup -q -n %{src_name}-%{version}
-%patch1 -p0
-
-%build
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags -DMSG_NOSIGNAL=0"
-export CXXFLAGS="%cxx_optflags -DMSG_NOSIGNAL=0"
-./bootstrap
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --disable-debug
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%post
-gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_bindir}/*
-%{_libdir}/*
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (0755, root, other) %{_datadir}/locale
-%{_datadir}/scim/*
-
--- a/specs/scim-m17n.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-%include Solaris.inc
-
-%define src_name scim-m17n
-%define src_url http://jaist.dl.sourceforge.net/sourceforge/scim
-
-Summary: Smart Common Input Method Framework - libm17n IMEngine
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim-m17n
-Version: 0.2.2
-Release: 1
-License: GPL
-Source: %{src_url}/%{src_name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-SUNW_Copyright: scim-m17n.copyright
-IPS_Package_Name: system/input-method/scim/scim-m17n
-IPS_Component_Version: %{ipscompverdefault}
-Meta(info.classification): %{ipsclass_sys_i18n}
-
-%include default-depend.inc
-Requires: SUNWscim
-Requires: SUNWm17n-lib-core
-Requires: SUNWm17n-db
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWscim-devel
-BuildRequires: SUNWm17n-lib-core-devel
-
-%prep
-%setup -q -n %{src_name}-%{version}
-
-%build
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-./bootstrap
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --disable-debug
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_libdir}/scim-1.0/*
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/*
--- a/specs/scim-pinyin.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-%include Solaris.inc
-
-%define src_name scim-pinyin
-%define src_url http://jaist.dl.sourceforge.net/sourceforge/scim
-
-Summary: Smart Common Input Method Framework - Smart PinYin IMEngine
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim-pinyin
-Version: 0.5.91
-Release: 1
-License: GPL
-Source: %{src_url}/%{src_name}-%{version}.tar.gz
-Patch1: scim-pinyin-0.5.91-on-nv-ss11-patch.diff
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-SUNW_PKGLIST: SUNWscim
-SUNW_LOC: zh,zh.UTF-8
-SUNW_Copyright: %{src_name}.copyright
-IPS_Package_Name: system/input-method/scim/pinyin
-IPS_Component_Version: %{version}
-Meta(info.classification): %{ipsclass_sys_i18n}
-
-
-%include default-depend.inc
-Requires: SUNWscim
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWscim-devel
-
-%prep
-%setup -q -n %{src_name}-%{version}
-%patch1 -p0
-
-%build
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-./bootstrap
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --disable-debug
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_libdir}/scim-1.0/*
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (0755, root, other) %{_datadir}/locale
-%{_datadir}/scim/*
--- a/specs/scim-sunpinyin.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-%include Solaris.inc
-
-%define src_name sunpinyin-ime
-
-Summary: Smart Common Input Method Framework - SunPinyin IMEngine
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim-sunpinyin
-Version: 1.0
-Release: 1
-License: CDDL/LGPL
-Source: %{src_name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-SUNW_PKGLIST: SUNWscim
-SUNW_LOC: zh,zh.UTF-8
-SUNW_Copyright: sunpinyin.copyright
-IPS_Package_Name: system/input-method/scim/sunpinyin
-IPS_Component_Version: %{version}
-Meta(info.classification): %{ipsclass_sys_i18n}
-
-
-%include default-depend.inc
-Requires: SUNWscim
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWscim-devel
-
-%prep
-%setup -q -n %{src_name}-%{version}
-
-%build
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-./autogen.sh --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --disable-debug \
- --disable-cle --enable-scim
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_libdir}/scim-1.0/*
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (0755, root, other) %{_datadir}/locale
-%{_datadir}/scim/*
-
--- a/specs/scim-tables.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-%include Solaris.inc
-
-%define src_name scim-tables
-%define src_url http://jaist.dl.sourceforge.net/sourceforge/scim
-
-Summary: Smart Common Input Method Framework - Codetable IMEngine
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim-tables
-Version: 0.5.7
-Release: 1
-License: GPL
-Source: %{src_url}/%{src_name}-%{version}.tar.gz
-Patch1: scim-tables-0.5.7-on-nv-ss11-patch.diff
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-SUNW_Copyright: %{src_name}.copyright
-IPS_Package_Name: system/input-method/scim/table
-IPS_Component_Version: %{version}
-Meta(info.classification): %{ipsclass_sys_i18n}
-
-%include default-depend.inc
-Requires: SUNWscim
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWscim-devel
-
-%package chinese
-Summary: Smart Common Input Method Framework - Codetable for Chinese
-%include default-depend.inc
-Requires: SUNWscim
-Requires: SUNWscim-tables
-SUNW_PKGLIST: SUNWscim
-SUNW_LOC: zh,zh.UTF-8,zh_TW,zh_TW.UTF-8
-IPS_Package_Name: system/input-method/scim/table/chinese
-
-%package japanese
-Summary: Smart Common Input Method Framework - Codetable for Japanese
-%include default-depend.inc
-Requires: SUNWscim
-Requires: SUNWscim-tables
-SUNW_PKGLIST: SUNWscim
-SUNW_LOC: ja,ja_JP.PCK,ja_JP.UTF-8
-IPS_Package_Name: system/input-method/scim/table/japanese
-
-%package korean
-Summary: Smart Common Input Method Framework - Codetable for Korean
-%include default-depend.inc
-Requires: SUNWscim
-Requires: SUNWscim-tables
-SUNW_PKGLIST: SUNWscim
-SUNW_LOC: ko,ko.UTF-8
-IPS_Package_Name: system/input-method/scim/table/korean
-
-%package india
-Summary: Smart Common Input Method Framework - Codetable for India
-%include default-depend.inc
-Requires: SUNWscim
-Requires: SUNWscim-tables
-SUNW_PKGLIST: SUNWscim
-SUNW_LOC: hi_IN.UTF-8
-IPS_Package_Name: system/input-method/scim/table/india
-
-%package extra
-Summary: Smart Common Input Method Framework - Codetable for extra languages
-%include default-depend.inc
-Requires: SUNWscim
-Requires: SUNWscim-tables
-IPS_Package_Name: system/input-method/scim/table/extra
-
-%prep
-%setup -q -n %{src_name}-%{version}
-%patch1 -p0
-
-%build
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-./bootstrap
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --disable-debug
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_bindir}/*
-%{_libdir}/scim-1.0/*
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (0755, root, other) %{_datadir}/locale
-%{_datadir}/man/*
-%{_datadir}/scim/icons/table.png
-
-%files chinese
-%defattr(-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/scim/tables/Array30.bin
-%{_datadir}/scim/tables/CangJie.bin
-%{_datadir}/scim/tables/CangJie5.bin
-%{_datadir}/scim/tables/Cantonese.bin
-%{_datadir}/scim/tables/EZ-Big.bin
-%{_datadir}/scim/tables/Erbi.bin
-%{_datadir}/scim/tables/Quick.bin
-%{_datadir}/scim/tables/Stroke5.bin
-%{_datadir}/scim/tables/Wubi.bin
-%{_datadir}/scim/tables/ZhuYin.bin
-%{_datadir}/scim/tables/CNS11643.bin
-%{_datadir}/scim/tables/CangJie3.bin
-%{_datadir}/scim/tables/CantonHK.bin
-%{_datadir}/scim/tables/Dayi3.bin
-%{_datadir}/scim/tables/Erbi-QS.bin
-%{_datadir}/scim/tables/Jyutping.bin
-%{_datadir}/scim/tables/Simplex.bin
-%{_datadir}/scim/tables/Wu.bin
-%{_datadir}/scim/tables/ZhuYin-Big.bin
-%{_datadir}/scim/tables/Ziranma.bin
-%{_datadir}/scim/icons/Array30.png
-%{_datadir}/scim/icons/CangJie.png
-%{_datadir}/scim/icons/Cantonese.png
-%{_datadir}/scim/icons/Dayi.png
-%{_datadir}/scim/icons/Erbi.png
-%{_datadir}/scim/icons/EZ.png
-%{_datadir}/scim/icons/Quick.png
-%{_datadir}/scim/icons/Stroke5.png
-%{_datadir}/scim/icons/Wubi.png
-%{_datadir}/scim/icons/ZhuYin.png
-%{_datadir}/scim/icons/CNS11643.png
-%{_datadir}/scim/icons/CangJie3.png
-%{_datadir}/scim/icons/CantonHK.png
-%{_datadir}/scim/icons/Erbi-QS.png
-%{_datadir}/scim/icons/Jyutping.png
-%{_datadir}/scim/icons/Simplex.png
-%{_datadir}/scim/icons/Wu.png
-%{_datadir}/scim/icons/Ziranma.png
-
-%files japanese
-%defattr(-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/scim/tables/HIRAGANA.bin
-%{_datadir}/scim/tables/KATAKANA.bin
-%{_datadir}/scim/tables/Nippon.bin
-%{_datadir}/scim/icons/HIRAGANA.png
-%{_datadir}/scim/icons/KATAKANA.png
-%{_datadir}/scim/icons/Nippon.png
-
-%files korean
-%defattr(-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/scim/tables/Hangul.bin
-%{_datadir}/scim/tables/HangulRomaja.bin
-%{_datadir}/scim/tables/Hanja.bin
-%{_datadir}/scim/icons/Hangul.png
-%{_datadir}/scim/icons/Hanja.png
-
-%files india
-%defattr(-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/scim/tables/Bengali-probhat.bin
-%{_datadir}/scim/tables/Bengali-inscript.bin
-%{_datadir}/scim/tables/Gujarati-inscript.bin
-%{_datadir}/scim/tables/Gujarati-phonetic.bin
-%{_datadir}/scim/tables/Hindi-inscript.bin
-%{_datadir}/scim/tables/Hindi-phonetic.bin
-%{_datadir}/scim/tables/Kannada-inscript.bin
-%{_datadir}/scim/tables/Kannada-kgp.bin
-%{_datadir}/scim/tables/Malayalam-inscript.bin
-%{_datadir}/scim/tables/Nepali_Rom.bin
-%{_datadir}/scim/tables/Nepali_Trad.bin
-%{_datadir}/scim/tables/Punjabi-inscript.bin
-%{_datadir}/scim/tables/Punjabi-jhelum.bin
-%{_datadir}/scim/tables/Punjabi-phonetic.bin
-%{_datadir}/scim/tables/Tamil-inscript.bin
-%{_datadir}/scim/tables/Tamil-phonetic.bin
-%{_datadir}/scim/tables/Tamil-remington.bin
-%{_datadir}/scim/tables/Telugu-inscript.bin
-%{_datadir}/scim/icons/Bengali-probhat.png
-%{_datadir}/scim/icons/Bengali-inscript.png
-%{_datadir}/scim/icons/Gujarati-inscript.png
-%{_datadir}/scim/icons/Gujarati-phonetic.png
-%{_datadir}/scim/icons/Hindi-inscript.png
-%{_datadir}/scim/icons/Hindi-phonetic.png
-%{_datadir}/scim/icons/Kannada-inscript.png
-%{_datadir}/scim/icons/Kannada-kgp.png
-%{_datadir}/scim/icons/Malayalam-inscript.png
-%{_datadir}/scim/icons/Nepali.png
-%{_datadir}/scim/icons/Punjabi-inscript.png
-%{_datadir}/scim/icons/Punjabi-jhelum.png
-%{_datadir}/scim/icons/Punjabi-phonetic.png
-%{_datadir}/scim/icons/Tamil-inscript.png
-%{_datadir}/scim/icons/Tamil-phonetic.png
-%{_datadir}/scim/icons/Tamil-remington.png
-%{_datadir}/scim/icons/Telugu-inscript.png
-
-%files extra
-%defattr(-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/scim/tables/Amharic.bin
-%{_datadir}/scim/tables/Arabic.bin
-%{_datadir}/scim/tables/Yawerty.bin
-%{_datadir}/scim/tables/Thai.bin
-%{_datadir}/scim/tables/Viqr.bin
-%{_datadir}/scim/tables/LaTeX.bin
-%{_datadir}/scim/tables/IPA-X-SAMPA.bin
-%{_datadir}/scim/icons/Amharic.png
-%{_datadir}/scim/icons/Arabic.png
-%{_datadir}/scim/icons/Yawerty.png
-%{_datadir}/scim/icons/Thai.png
-%{_datadir}/scim/icons/Viqr.png
-%{_datadir}/scim/icons/LaTeX.png
-%{_datadir}/scim/icons/IPA-X-SAMPA.png
--- a/specs/scim-thai.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-%include Solaris.inc
-
-%define src_name scim-thai
-%define src_url http://linux.thai.net/pub/thailinux/software/libthai
-
-Summary: Smart Common Input Method Framework - libthai IMEngine
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim-thai
-Version: 0.1.0
-Release: 1
-License: GPL
-Source: %{src_url}/%{src_name}-%{version}.tar.gz
-Patch1: scim-thai-0.1.0-on-nv-ss11-patch.diff
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-SUNW_PKGLIST: SUNWscim
-SUNW_LOC: th_TH,th_TH.UTF-8
-SUNW_Copyright: %{src_name}.copyright
-IPS_Package_Name: system/input-method/scim/thai
-IPS_Component_Version: %{version}
-Meta(info.classification): %{ipsclass_sys_i18n}
-
-
-%include default-depend.inc
-Requires: SUNWscim
-Requires: SUNWlibthai
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWscim-devel
-BuildRequires: SUNWlibthai-devel
-
-%prep
-%setup -q -n %{src_name}-%{version}
-%patch1 -p0
-
-%build
-glib-gettextize --force
-aclocal
-autoconf
-autoheader
-automake --add-missing
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --disable-debug
-make
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_libdir}/scim-1.0/*
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/scim/*
-
--- a/specs/scim.spec Sat Aug 27 02:29:59 2011 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-%include Solaris.inc
-
-%define src_name scim
-%define src_url http://jaist.dl.sourceforge.net/sourceforge/scim
-
-Summary: Smart Common Input Method Framework
-SUNW_BaseDir: %{_basedir}
-Name: SUNWscim
-Version: 1.4.7
-Release: 1
-License: LGPL
-Source: %{src_url}/%{src_name}-%{version}.tar.gz
-Source1: scim-xinput
-Patch1: scim-with-solaris-iconv-patch.diff
-Patch2: scim-1.4.7-on-nv-ss12-patch.diff
-Patch3: scim-no-default-imm-patch.diff
-Patch4: scim-menu-patch.diff
-BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
-SUNW_Copyright: %{src_name}.copyright
-
-%include default-depend.inc
-Requires: SUNWlibC
-Requires: SUNWscim-root
-Requires: SUNWgnome-panel
-BuildRequires: SUNWgnome-base-libs-devel
-BuildRequires: SUNWgnome-panel-devel
-
-%package root
-Summary: %{summary} (ROOT)
-SUNW_BaseDir: /
-%include default-depend.inc
-Requires: SUNWgnome-panel-root
-
-%package devel
-Summary: %{summary} - development files
-SUNW_BaseDir: %{_basedir}
-%include default-depend.inc
-
-%prep
-%setup -q -n %{src_name}-%{version}
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4 -p1
-touch ChangeLog
-
-%ifarch amd64 sparcv9
-cd ..
-rm -rf %{src_name}-%{version}-64
-cp -pr %{src_name}-%{version} %{src_name}-%{version}-64
-%endif
-
-%build
-GTK_BIN_VER=`pkg-config --variable=gtk_binary_version gtk+-2.0`
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags"
-export CXXFLAGS="%cxx_optflags"
-export LDFLAGS="%_ldflags -lsocket"
-./bootstrap
-intltoolize --force --copy
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --with-gtk-im-module-dir=%{_libdir}/gtk-2.0/$GTK_BIN_VER/immodules \
- --disable-debug
-make
-
-%ifarch amd64 sparcv9
-cd ..
-cd %{src_name}-%{version}-64
-export CXX="${CXX} -norunpath"
-export CFLAGS="%optflags64"
-export CXXFLAGS="%cxx_optflags64"
-export LDFLAGS="%_ldflags -lsocket"
-./bootstrap
-intltoolize --force --copy
-./configure --prefix=%{_prefix}/%{_arch64} \
- --bindir=%{_bindir}/%{_arch64} \
- --libdir=%{_libdir}/%{_arch64} \
- --sysconfdir=%{_sysconfdir}/%{_arch64} \
- --with-gtk-im-module-dir=%{_libdir}/%{_arch64}/gtk-2.0/$GTK_BIN_VER/immodules \
- --disable-frontend-x11 \
- --disable-frontend-socket \
- --disable-panel-gtk \
- --disable-setup-ui \
- --disable-filter-sctc \
- --disable-debug
-make
-%endif
-
-%install
-rm -rf ${RPM_BUILD_ROOT}
-DESTDIR=${RPM_BUILD_ROOT} make install
-ginstall -D --mode=0755 %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/imf.d/0030.scim
-(cd $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/imf.d; ln -s 0030.scim 0031.SCIM)
-
-%ifarch amd64 sparcv9
-cd ..
-cd %{src_name}-%{version}-64
-DESTDIR=${RPM_BUILD_ROOT} make install
-rm -rf ${RPM_BUILD_ROOT}/usr/%{_arch64}
-rm -rf ${RPM_BUILD_ROOT}/usr/bin/%{_arch64}
-rm -rf ${RPM_BUILD_ROOT}/usr/lib/%{_arch64}/pkgconfig
-rm -rf ${RPM_BUILD_ROOT}/usr/lib/%{_arch64}/scim-1.0/scim*
-%endif
-
-find ${RPM_BUILD_ROOT} -name "*.a" -exec rm {} \; -print
-find ${RPM_BUILD_ROOT} -name "*.la" -exec rm {} \; -print
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%post
-#%include update-gtk-immodules.script
-
-%postun
-#%include update-gtk-immodules.script
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, bin)
-%{_bindir}/*
-%{_libdir}/lib*.so*
-%{_libdir}/gtk-2.0/*
-%{_libdir}/scim-1.0/*
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (0755, root, other) %{_datadir}/locale
-%dir %attr (0755, root, other) %{_datadir}/applications
-%{_datadir}/applications/*
-%dir %attr (0755, root, other) %{_datadir}/control-center-2.0
-%dir %attr (0755, root, other) %{_datadir}/control-center-2.0/capplets
-%{_datadir}/control-center-2.0/capplets/*
-%dir %attr (0755, root, other) %{_datadir}/pixmaps
-%{_datadir}/pixmaps/*
-%{_datadir}/scim/*
-
-%ifarch amd64 sparcv9
-%{_libdir}/%{_arch64}/lib*.so*
-%{_libdir}/%{_arch64}/gtk-2.0/*
-%{_libdir}/%{_arch64}/scim-1.0/*
-%endif
-
-%files root
-%attr (0755, root, sys) %{_sysconfdir}
-
-%files devel
-%defattr(-, root, bin)
-%dir %attr (0755, root, other) %{_libdir}/pkgconfig
-%{_libdir}/pkgconfig/*
-%{_includedir}/*