Mercurial Mercurial > upstream > oracle > g11n > inputmethod / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
specs/patches/scim-1.4.6-on-nv-ss12-patch.diff
changeset 706 ca594d31f781
parent 705 c5b0af57a88c
child 707 dfbe6c035259 
--- 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@
upstream/oracle/g11n/inputmethod