From c96996a20f9de3c78f18b8c84f81ae722e1e7f19 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Nov 08 2010 02:01:32 +0000 Subject: - Rebuilt against ibus-1.3.99. --- diff --git a/.gitignore b/.gitignore index 58118db..3d60323 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +*.rpm +clog /mozc-0.12.434.102-20100823.tar.bz2 /mozc-0.13.464.102-20100910.tar.bz2 /mozc-0.13.481.102-20100927.tar.bz2 diff --git a/mozc-ibus-1.3.99.patch b/mozc-ibus-1.3.99.patch new file mode 100644 index 0000000..7c7d42b --- /dev/null +++ b/mozc-ibus-1.3.99.patch @@ -0,0 +1,16 @@ +Index: unix/ibus/main.cc +=================================================================== +--- unix/ibus/main.cc (revision 48) ++++ unix/ibus/main.cc (working copy) +@@ -109,8 +109,9 @@ + GList *engines = ibus_component_get_engines(component); + for (GList *p = engines; p; p = p->next) { + IBusEngineDesc *engine = reinterpret_cast(p->data); +- ibus_factory_add_engine( +- factory, engine->name, mozc::ibus::MozcEngine::GetType()); ++ ibus_factory_add_engine(factory, ++ ibus_engine_desc_get_name(engine), ++ mozc::ibus::MozcEngine::GetType()); + } + + if (executed_by_ibus_daemon) { diff --git a/mozc.spec b/mozc.spec index e6e1011..f5f3f4a 100644 --- a/mozc.spec +++ b/mozc.spec @@ -36,11 +36,13 @@ URL: http://code.google.com/p/mozc Source0: mozc-%{version}-%{archivedate}.tar.bz2 Source1: mozc-init.el Patch0: mozc-build-verbosely.patch +# http://code.google.com/p/mozc/issues/detail?id=65 +Patch1: mozc-ibus-1.3.99.patch BuildRequires: python gettext BuildRequires: openssl-devel libstdc++-devel zlib-devel libcurl-devel gtest-devel protobuf-devel qt-devel BuildRequires: gyp >= 0.1-0.4.840svn -BuildRequires: ibus-devel +BuildRequires: ibus-devel >= 1.3.99 BuildRequires: scim-devel BuildRequires: emacs BuildRequires: xemacs xemacs-packages-extra @@ -143,6 +145,7 @@ to use mozc with XEmacs. %prep %setup -q -c -n %{name}-%{version} %patch0 -p0 -b .0-build-verbosely +%patch1 -p0 -b .1-ibus-1.3.99 %build @@ -259,8 +262,8 @@ rm -rf $RPM_BUILD_ROOT %{_xemacs_sitelispdir}/%{pkg}/*.el %changelog -* Fri Nov 5 2010 Akira TAGOH = 0.13.523.102-0.2.20101104svn -- Rebuilt. +* Mon Nov 8 2010 Akira TAGOH = 0.13.523.102-0.2.20101104svn +- Rebuilt against ibus-1.3.99. * Thu Nov 4 2010 Akira TAGOH - 0.13.523.102-0.1.20101104svn - Update to 0.13.523.102.