--- 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
-