Gentoo Archives: gentoo-commits

From: "Matsuu Takuto (matsuu)" <matsuu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-i18n/ibus-mozc/files: ibus-mozc-1.1.717.102-gcc46.patch
Date: Wed, 01 Jun 2011 00:02:07
Message-Id: 20110601000156.32B2F2004B@flycatcher.gentoo.org
1 matsuu 11/06/01 00:01:56
2
3 Added: ibus-mozc-1.1.717.102-gcc46.patch
4 Log:
5 Fixed compile issue with gcc-4.6, bug #368713.
6
7 (Portage version: 2.1.9.50/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 app-i18n/ibus-mozc/files/ibus-mozc-1.1.717.102-gcc46.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus-mozc/files/ibus-mozc-1.1.717.102-gcc46.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus-mozc/files/ibus-mozc-1.1.717.102-gcc46.patch?rev=1.1&content-type=text/plain
14
15 Index: ibus-mozc-1.1.717.102-gcc46.patch
16 ===================================================================
17 diff -Naur mozc-1.1.717.102.orig/base/util.cc mozc-1.1.717.102/base/util.cc
18 --- mozc-1.1.717.102.orig/base/util.cc 2011-05-20 17:17:00.000000000 +0900
19 +++ mozc-1.1.717.102/base/util.cc 2011-05-31 19:14:38.129021596 +0900
20 @@ -373,7 +373,6 @@
21 while (*str == ' ' || *str == '\t') {
22 ++str;
23 }
24 - bool inquote = false;
25 if (*str == '"') {
26 start = ++str;
27 end = start;
28 @@ -385,7 +384,6 @@
29 }
30 *end++ = *str;
31 }
32 - inquote = true;
33 str = find(str, eos, ',');
34 } else {
35 start = str;
36 diff -Naur mozc-1.1.717.102.orig/rewriter/collocation_rewriter.cc mozc-1.1.717.102/rewriter/collocation_rewriter.cc
37 --- mozc-1.1.717.102.orig/rewriter/collocation_rewriter.cc 2011-05-20 17:17:03.000000000 +0900
38 +++ mozc-1.1.717.102/rewriter/collocation_rewriter.cc 2011-06-01 08:17:44.886890850 +0900
39 @@ -575,7 +575,6 @@
40 for (size_t i = segments->history_segments_size();
41 i < segments->segments_size(); ++i) {
42 bool rewrited_next = false;
43 - bool rewrited_prev = false;
44
45 if (IsKeyUnknown(segments->segment(i))) {
46 continue;
47 @@ -596,7 +595,6 @@
48 RewriteFromPrevSegment(segments->segment(i - 1).candidate(0),
49 segments->mutable_segment(i))) {
50 changed = true;
51 - rewrited_prev =true;
52 segs_changed[i - 1] = true;
53 segs_changed[i] = true;
54 }