summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2014-06-05 01:40:06 +0000
committerNaohiro Aota <naota@gentoo.org>2014-06-05 01:40:06 +0000
commit8dd4ae99d58866b61404344b05624dac21adeb67 (patch)
tree0c068569124886c6caab8840ddda88c0433e30c9 /app-i18n
parentDespite ./configure --help telling the flag name is --disable-gnome, it's in ... (diff)
downloadgentoo-2-8dd4ae99d58866b61404344b05624dac21adeb67.tar.gz
gentoo-2-8dd4ae99d58866b61404344b05624dac21adeb67.tar.bz2
gentoo-2-8dd4ae99d58866b61404344b05624dac21adeb67.zip
Add upstream patch #512248
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/mozc/ChangeLog6
-rw-r--r--app-i18n/mozc/files/mozc-1.13.1651.102-gtk-renderer.patch13
-rw-r--r--app-i18n/mozc/mozc-1.13.1651.102.ebuild3
3 files changed, 20 insertions, 2 deletions
diff --git a/app-i18n/mozc/ChangeLog b/app-i18n/mozc/ChangeLog
index 2cab25040e86..ceae721194cc 100644
--- a/app-i18n/mozc/ChangeLog
+++ b/app-i18n/mozc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-i18n/mozc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/ChangeLog,v 1.10 2014/06/01 21:30:44 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/ChangeLog,v 1.11 2014/06/05 01:40:06 naota Exp $
+
+ 05 Jun 2014; Naohiro Aota <naota@gentoo.org>
+ +files/mozc-1.13.1651.102-gtk-renderer.patch, mozc-1.13.1651.102.ebuild:
+ Add upstream patch #512248
*mozc-1.13.1651.102 (01 Jun 2014)
diff --git a/app-i18n/mozc/files/mozc-1.13.1651.102-gtk-renderer.patch b/app-i18n/mozc/files/mozc-1.13.1651.102-gtk-renderer.patch
new file mode 100644
index 000000000000..bff0822a602d
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-1.13.1651.102-gtk-renderer.patch
@@ -0,0 +1,13 @@
+diff --git a/unix/ibus/mozc_engine.cc b/unix/ibus/mozc_engine.cc
+index e256ea4..534262e 100755
+--- a/unix/ibus/mozc_engine.cc
++++ b/unix/ibus/mozc_engine.cc
+@@ -250,8 +250,6 @@ MozcEngine::MozcEngine()
+ #ifdef ENABLE_GTK_RENDERER
+ gtk_candidate_window_handler_(new GtkCandidateWindowHandler(
+ new renderer::RendererClient())),
+-#else
+- gtk_candidate_window_handler_(NULL),
+ #endif // ENABLE_GTK_RENDERER
+ ibus_candidate_window_handler_(new IBusCandidateWindowHandler()),
+ preedit_method_(config::Config::ROMAN) {
diff --git a/app-i18n/mozc/mozc-1.13.1651.102.ebuild b/app-i18n/mozc/mozc-1.13.1651.102.ebuild
index 5935078a8edd..7259b78a4ccc 100644
--- a/app-i18n/mozc/mozc-1.13.1651.102.ebuild
+++ b/app-i18n/mozc/mozc-1.13.1651.102.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/mozc-1.13.1651.102.ebuild,v 1.1 2014/06/01 21:30:44 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/mozc-1.13.1651.102.ebuild,v 1.2 2014/06/05 01:40:06 naota Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -70,6 +70,7 @@ src_unpack() {
}
src_prepare() {
+ epatch "${FILESDIR}"/${P}-gtk-renderer.patch
epatch_user
}