Mercurial Mercurial > upstream > spec-files-extra / file revision
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.
patches/scim-01-ss11-patch.diff
author drdoug007
Fri, 27 Jul 2007 10:23:02 +0000
changeset 353 70b47e90db3f
child 762 b7d5033f034b
permissions -rw-r--r--
2007-07-27 Doug Scott <[email protected]> * SFElibanthy.spec: *NEW* Japanese input method * SFElibthai.spec: *NEW* Thai language support routines * SFEkmflcomp.spec: *NEW* Keyboard Mapping for Linux * SFEwordcut.spec: *NEW* Word Segmentation Utility for Thai Language * SFEm17n-im-config.spec: *NEW* m17n im config tool * SFElibdatrie.spec: *NEW* Implementation of double-array structure for representing trie * SFEm17n-db.spec: *NEW* m17n database * SFEscim.spec: *NEW* Smart Common Input Method Framework * SFEscim-thai.spec: *NEW* SCIM Thai language support * SFEscim-m17n.spec: *NEW* SCIM libm17n IMEngine * SFElibkmfl.spec: *NEW* Keyboard Mapping library for Linux * SFEm17n-lib.spec: *NEW* m17n library * SFElibhangul.spec: *NEW* portable library for processing hangul * SFElibchewing.spec: *NEW* Chewing Input Method library * SFEuim.spec: *NEW* UIM Input Method Framework * SFElibotf.spec: *NEW* Library for handling OpenType fonts * SFEm17n-contrib.spec: *NEW* m17n Contributed Data * SFEgtk-im-libthai.spec: *NEW* Thai language gtk im module * SFEscim-kmfl.spec: *NEW* SCIM kmfl imengine bridge * patches/libchewing-01-configure.diff: Remove AM_PATH_CHECK * patches/scim-kmfl-03-solaris.diff: Misc solaris patches * patches/scim-kmfl-02-strchr.diff: remove strchr test * patches/anthy-01-alloca.diff: add <alloca.h> * patches/scim-02-ss12-patch.diff: Solaris patch * patches/scim-kmfl-01-wall.diff: Remove -Wall * patches/kmflcomp-01-wall.diff: Remove -Wall * patches/m17n-lib-02-alloca.diff: add <alloca.h> * patches/uim-01-ss11.diff: Solaris patch * patches/scim-01-ss11-patch.diff: Solaris patch * patches/m17n-lib-01-intl.diff: Fix intl build * patches/libhangul-01-endian.diff: change endian.h to sys/byteorder.h * patches/libkmfl-01-wall.diff: Remove -Wall * patches/uim-01-ss11-patch.diff: Solaris patch

diff -ur scim-1.4.7-orig/Makefile.am scim-1.4.7/Makefile.am
--- scim-1.4.7-orig/Makefile.am	2007-06-26 21:31:57.000000000 +0700
+++ scim-1.4.7/Makefile.am	2007-07-26 17:59:28.176732459 +0700
@@ -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
 
diff -ur scim-1.4.7-orig/bootstrap scim-1.4.7/bootstrap
--- scim-1.4.7-orig/bootstrap	2007-06-27 11:19:16.000000000 +0700
+++ scim-1.4.7/bootstrap	2007-07-26 17:59:28.176953161 +0700
@@ -20,7 +20,7 @@
 #! /bin/sh
 
 set -x
-aclocal -I m4
+aclocal
 autoheader
 libtoolize -c --automake 
 automake --add-missing --copy --include-deps
diff -ur scim-1.4.7-orig/configure.ac scim-1.4.7/configure.ac
--- scim-1.4.7-orig/configure.ac	2007-06-26 21:31:57.000000000 +0700
+++ scim-1.4.7/configure.ac	2007-07-26 17:59:28.177292573 +0700
@@ -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
diff -ur scim-1.4.7-orig/extras/gtk2_immodule/Makefile.am scim-1.4.7/extras/gtk2_immodule/Makefile.am
--- scim-1.4.7-orig/extras/gtk2_immodule/Makefile.am	2007-06-26 21:31:50.000000000 +0700
+++ scim-1.4.7/extras/gtk2_immodule/Makefile.am	2007-07-26 17:59:28.177457419 +0700
@@ -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@
 
diff -ur scim-1.4.7-orig/extras/setup/Makefile.am scim-1.4.7/extras/setup/Makefile.am
--- scim-1.4.7-orig/extras/setup/Makefile.am	2007-06-26 21:31:50.000000000 +0700
+++ scim-1.4.7/extras/setup/Makefile.am	2007-07-26 17:59:28.177611640 +0700
@@ -55,7 +55,6 @@
 setup_la_LDFLAGS	= -avoid-version \
 		     	  -rpath $(moduledir) \
 			  -module \
-			  -lstdc++ \
 			  @LIBTOOL_EXPORT_OPTIONS@ \
 			  @GTK2_LIBS@ \
 			  @LTLIBINTL@
diff -ur scim-1.4.7-orig/modules/FrontEnd/scim_x11_frontend.cpp scim-1.4.7/modules/FrontEnd/scim_x11_frontend.cpp
--- scim-1.4.7-orig/modules/FrontEnd/scim_x11_frontend.cpp	2007-06-26 21:31:52.000000000 +0700
+++ scim-1.4.7/modules/FrontEnd/scim_x11_frontend.cpp	2007-07-26 17:59:28.178378847 +0700
@@ -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"
 
diff -ur scim-1.4.7-orig/src/Makefile.am scim-1.4.7/src/Makefile.am
--- scim-1.4.7-orig/src/Makefile.am	2007-06-26 21:31:38.000000000 +0700
+++ scim-1.4.7/src/Makefile.am	2007-07-26 17:59:28.178585394 +0700
@@ -134,8 +134,7 @@
 			  $(LD_VERSION_SCRIPT_OPTION) \
 			  @LIBTOOL_EXPORT_OPTIONS@ \
 			  @LIBICONV@ \
-			  @LTLIBINTL@ \
-			  -lstdc++
+			  @LTLIBINTL@ 
 
 libscim@SCIM_EPOCH@_la_LIBADD	= libltdlc.la
 
diff -ur scim-1.4.7-orig/src/ltdl.cpp scim-1.4.7/src/ltdl.cpp
--- scim-1.4.7-orig/src/ltdl.cpp	2007-06-26 21:31:37.000000000 +0700
+++ scim-1.4.7/src/ltdl.cpp	2007-07-26 17:59:28.179790764 +0700
@@ -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.  */
diff -ur scim-1.4.7-orig/src/scim.h scim-1.4.7/src/scim.h
--- scim-1.4.7-orig/src/scim.h	2007-06-26 21:31:37.000000000 +0700
+++ scim-1.4.7/src/scim.h	2007-07-26 17:59:28.180094797 +0700
@@ -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
diff -ur scim-1.4.7-orig/src/scim_pointer.h scim-1.4.7/src/scim_pointer.h
--- scim-1.4.7-orig/src/scim_pointer.h	2007-06-26 21:31:38.000000000 +0700
+++ scim-1.4.7/src/scim_pointer.h	2007-07-26 17:59:28.180308231 +0700
@@ -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());
     }
diff -ur scim-1.4.7-orig/src/scim_slot.h scim-1.4.7/src/scim_slot.h
--- scim-1.4.7-orig/src/scim_slot.h	2007-06-26 21:31:38.000000000 +0700
+++ scim-1.4.7/src/scim_slot.h	2007-07-26 17:59:28.180910124 +0700
@@ -149,7 +149,7 @@
 
 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 @@
 
 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 @@
 
 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 @@
 
 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 @@
 
 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 @@
 
 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 @@
 
 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);
 }
diff -ur scim-1.4.7-orig/src/scim_socket.cpp scim-1.4.7/src/scim_socket.cpp
--- scim-1.4.7-orig/src/scim_socket.cpp	2007-06-26 21:31:38.000000000 +0700
+++ scim-1.4.7/src/scim_socket.cpp	2007-07-26 17:59:28.181620208 +0700
@@ -47,6 +47,10 @@
 #include <signal.h>
 #include <sys/time.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"
 
Only in scim-1.4.7/src: scim_socket.cpp~
diff -ur scim-1.4.7-orig/src/scim_transaction.cpp scim-1.4.7/src/scim_transaction.cpp
--- scim-1.4.7-orig/src/scim_transaction.cpp	2007-06-26 21:31:38.000000000 +0700
+++ scim-1.4.7/src/scim_transaction.cpp	2007-07-26 17:59:28.182264597 +0700
@@ -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 ("");
 
Only in scim-1.4.7/src: scim_transaction.cpp~
diff -ur scim-1.4.7-orig/src/scim_utility.cpp scim-1.4.7/src/scim_utility.cpp
--- scim-1.4.7-orig/src/scim_utility.cpp	2007-06-26 21:31:38.000000000 +0700
+++ scim-1.4.7/src/scim_utility.cpp	2007-07-26 17:59:28.182704323 +0700
@@ -40,6 +40,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
+#include <locale.h>
 
 #include "scim_private.h"
 #include "scim.h"
diff -ur scim-1.4.7-orig/tests/Makefile.am scim-1.4.7/tests/Makefile.am
--- scim-1.4.7-orig/tests/Makefile.am	2007-06-26 21:31:46.000000000 +0700
+++ scim-1.4.7/tests/Makefile.am	2007-07-26 17:59:28.182853740 +0700
@@ -49,7 +49,6 @@
 test_helper_la_LDFLAGS	= -avoid-version \
 		     	  -rpath $(helpermoduledir) \
 			  -module \
-			  -lstdc++ \
 			  @LIBTOOL_EXPORT_OPTIONS@ \
 			  @GTK2_LIBS@ \
 			  @LTLIBINTL@
upstream/spec-files-extra