[scim-chewing] Fix FTBFS with libchewing-0.4.0 (#1107282)

Yaakov Selkowitz yselkowitz at fedoraproject.org
Tue Jul 8 03:04:38 UTC 2014


commit 2401b20bda772a5352138a2a35a55dce23056c8b
Author: Yaakov Selkowitz <yselkowi at redhat.com>
Date:   Fri Jun 20 11:21:35 2014 -0500

    Fix FTBFS with libchewing-0.4.0 (#1107282)

 scim-chewing-0.3.5-libchewing04.patch |   53 +++++++++++++++++++++++++++++++++
 scim-chewing.spec                     |    8 ++++-
 2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/scim-chewing-0.3.5-libchewing04.patch b/scim-chewing-0.3.5-libchewing04.patch
new file mode 100644
index 0000000..4658f47
--- /dev/null
+++ b/scim-chewing-0.3.5-libchewing04.patch
@@ -0,0 +1,53 @@
+Upstream commits: 545279e 1f3c42d 1e12860
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,7 +48,7 @@ AC_TYPE_SIZE_T
+ # Checks for libraries.
+ 
+ SCIM_VERSION=1.0.0
+-CHEWING_VERSION=0.3.4
++CHEWING_VERSION=0.4.0
+ 
+ PKG_CHECK_MODULES(SCIM, [scim >= $SCIM_VERSION])
+ 
+@@ -59,7 +59,7 @@ PKG_CHECK_MODULES(SCIM_GTKUTILS,[scim-gtkutils >= $SCIM_VERSION],
+ 
+ AC_SUBST(SCIM_VERSION)
+ 
+-PKG_CHECK_MODULES(CHEWING, [chewing = $CHEWING_VERSION])
++PKG_CHECK_MODULES(CHEWING, [chewing >= $CHEWING_VERSION])
+ AC_SUBST(CHEWING_VERSION)
+ 
+ AM_CONDITIONAL(SCIM_BUILD_SETUP, [test "$SCIM_HAS_GTKUTILS" = "yes"])
+--- a/src/scim_chewing_imengine.cpp
++++ b/src/scim_chewing_imengine.cpp
+@@ -73,8 +73,6 @@ extern "C" {
+ 	void scim_module_exit()
+ 	{
+ 		_scim_config.reset();
+-		/* New API introduced in libchewing 0.2.7 */
+-		chewing_Terminate();
+ 	}
+ 
+ 	unsigned int scim_imengine_module_init( const ConfigPointer& config )
+@@ -122,10 +120,6 @@ ChewingIMEngineFactory::ChewingIMEngineFactory( const ConfigPointer& config )
+ 
+ bool ChewingIMEngineFactory::init()
+ {
+-	char prefix[] = CHEWING_DATADIR;
+-	char hash_postfix[] = "/.chewing/";
+-
+-	chewing_Init(prefix, (char *)(scim_get_home_dir() + hash_postfix).c_str() );
+ 	return true;
+ }
+ 
+@@ -670,7 +664,7 @@ bool ChewingIMEngineInstance::commit( ChewingContext* ctx )
+ 
+ 	// cursor decoration
+ 	int current_cursor = chewing_cursor_Current( ctx );
+-	if( chewing_zuin_Check( ctx ) ) {
++	if( chewing_bopomofo_Check( ctx ) ) {
+ 		attr.push_back(
+ 			Attribute(
+ 				current_cursor,
diff --git a/scim-chewing.spec b/scim-chewing.spec
index 4ad586b..548a574 100644
--- a/scim-chewing.spec
+++ b/scim-chewing.spec
@@ -1,12 +1,14 @@
 Name:           scim-chewing
 Version:        0.3.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Chewing Chinese input method for SCIM
 
 License:        GPLv2+
 Url:            http://chewing.csie.net/
 Group:          System Environment/Libraries
 Source:         http://chewing.googlecode.com/files/%{name}-%{version}.tar.bz2
+Patch0:         scim-chewing-0.3.5-libchewing04.patch
+
 BuildRequires:  scim-devel, libchewing-devel >= 0.3.4, gettext, intltool >= 0.34
 BuildRequires:  libtool
 Requires:       scim
@@ -17,6 +19,7 @@ This package provides Chewing Chinese input method for SCIM.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 autoreconf -ivf
@@ -43,6 +46,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*/*.la
 
 
 %changelog
+* Fri Jun 20 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 0.3.5-4
+- Fix FTBFS with libchewing-0.4.0 (#1107282)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list