[fcitx-cloudpinyin] fix FTBFS with fcitx >= 4.2.7

Dan Horák sharkcz at fedoraproject.org
Thu May 23 10:58:59 UTC 2013


commit 457d6b8deebc3663d022d685f74a65deed48f97b
Author: Dan Horák <dan at danny.cz>
Date:   Thu May 23 12:58:55 2013 +0200

    fix FTBFS with fcitx >= 4.2.7

 fcitx-cloudpinyin-0.3.0-logging.patch |   30 ++++++++++++++++++++++++++++++
 fcitx-cloudpinyin.spec                |    7 ++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/fcitx-cloudpinyin-0.3.0-logging.patch b/fcitx-cloudpinyin-0.3.0-logging.patch
new file mode 100644
index 0000000..be4c2f4
--- /dev/null
+++ b/fcitx-cloudpinyin-0.3.0-logging.patch
@@ -0,0 +1,30 @@
+diff -up fcitx-cloudpinyin-0.3.0/src/cloudpinyin.c.logging fcitx-cloudpinyin-0.3.0/src/cloudpinyin.c
+--- fcitx-cloudpinyin-0.3.0/src/cloudpinyin.c.logging	2013-05-23 12:50:15.898226808 +0200
++++ fcitx-cloudpinyin-0.3.0/src/cloudpinyin.c	2013-05-23 12:55:20.623396540 +0200
+@@ -51,8 +51,6 @@
+ 
+ #define CLOUDPINYIN_CHECK_PAGE_NUMBER 3
+ 
+-#define LOGLEVEL DEBUG
+-
+ typedef struct _CloudCandWord {
+     boolean filled;
+     uint64_t timestamp;
+@@ -279,7 +277,7 @@ void CloudPinyinAddCandidateWord(void* a
+ 
+             if (inputString) {
+                 CloudPinyinCache* cacheEntry = CloudPinyinCacheLookup(cloudpinyin, inputString);
+-                FcitxLog(LOGLEVEL, "%s", inputString);
++                FcitxLog(DEBUG, "%s", inputString);
+                 if (cacheEntry == NULL)
+                     CloudPinyinAddInputRequest(cloudpinyin, inputString);
+                 _CloudPinyinAddCandidateWord(cloudpinyin, inputString);
+@@ -445,7 +443,7 @@ void CloudPinyinHandleRequest(FcitxCloud
+                 strToFree = GetCurrentString(cloudpinyin, &inputString);
+ 
+                 if (inputString) {
+-                    FcitxLog(LOGLEVEL, "fill: %s %s", inputString, queue->pinyin);
++                    FcitxLog(DEBUG, "fill: %s %s", inputString, queue->pinyin);
+                     if (strcmp(inputString, queue->pinyin) == 0)
+                     {
+                         if (CHECK_VALID_IM)
diff --git a/fcitx-cloudpinyin.spec b/fcitx-cloudpinyin.spec
index a41e4fb..093dba6 100644
--- a/fcitx-cloudpinyin.spec
+++ b/fcitx-cloudpinyin.spec
@@ -1,11 +1,12 @@
 Name:		fcitx-cloudpinyin
 Version:	0.3.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Cloudpinyin module for fcitx
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		http://code.google.com/p/fcitx/
 Source0:	http://fcitx.googlecode.com/files/%{name}-%{version}.tar.xz
+Patch0:		%{name}-0.3.0-logging.patch
 
 BuildRequires:	cmake, fcitx-devel, gettext, intltool, libcurl-devel, pkgconfig
 Requires:	fcitx
@@ -16,6 +17,7 @@ Cloulpinyin is an based cloud compute input method.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .logging
 
 
 %build
@@ -45,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu May 23 2013 Dan Horák <dan[at]danny.cz> - 0.3.0-3
+- fix FTBFS with fcitx >= 4.2.7
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list