Attachment 910822 Details for Bug 1107282 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-libchewing-0.4.0-1107282.patch (text/plain), 3.34 KB, created by Yaakov Selkowitz on 2014-06-20 16:23:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-20 16:23:35 UTC

Size: 3.34 KB

patch

obsolete

>From f2514c31fe8975090ab7b2fe141b6570d941de17 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowi@redhat.com>
>Date: Fri, 20 Jun 2014 11:21:35 -0500
>Subject: [PATCH] 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 deletion(-)
> create mode 100644 scim-chewing-0.3.5-libchewing04.patch
>
>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@redhat.com> - 0.3.5-4
>+- Fix FTBFS with libchewing-0.4.0 (#1107282)
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.5-3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1107282: 906563 | 906564 | 906565 | 910822