diff options
-rw-r--r-- | app-i18n/mozc/files/mozc-1.2.809.102-gentoo.patch | 14 | ||||
-rw-r--r-- | app-i18n/mozc/files/mozc-1.3.975.102-ibus-1.4.patch | 54 |
2 files changed, 0 insertions, 68 deletions
diff --git a/app-i18n/mozc/files/mozc-1.2.809.102-gentoo.patch b/app-i18n/mozc/files/mozc-1.2.809.102-gentoo.patch deleted file mode 100644 index 3e3ef1392932..000000000000 --- a/app-i18n/mozc/files/mozc-1.2.809.102-gentoo.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur mozc-1.2.809.102.orig/build_mozc.py mozc-1.2.809.102/build_mozc.py ---- mozc-1.2.809.102.orig/build_mozc.py 2011-08-17 10:02:41.000000000 +0900 -+++ mozc-1.2.809.102/build_mozc.py 2011-08-18 01:01:25.109704261 +0900 -@@ -654,9 +654,7 @@ - if envvar in os.environ: - os.environ[envvar] = os.getenv(envvar) - -- build_args = ['-j%s' % options.jobs, -- 'MAKE_JOBS=%s' % options.jobs, -- 'BUILDTYPE=%s' % options.configuration] -+ build_args = ['BUILDTYPE=%s' % options.configuration] - build_args.append('builddir_name=%s' % GetBuildBaseName(options)) - - RunOrDie([make_command] + build_args + target_names) diff --git a/app-i18n/mozc/files/mozc-1.3.975.102-ibus-1.4.patch b/app-i18n/mozc/files/mozc-1.3.975.102-ibus-1.4.patch deleted file mode 100644 index ed697b6c8bd8..000000000000 --- a/app-i18n/mozc/files/mozc-1.3.975.102-ibus-1.4.patch +++ /dev/null @@ -1,54 +0,0 @@ -http://bugs.gentoo.org/402397 - ---- unix/ibus/mozc_engine.cc -+++ unix/ibus/mozc_engine.cc -@@ -620,8 +620,15 @@ - - #ifndef OS_CHROMEOS - if (prop_mozc_tool_) { -+#if IBUS_CHECK_VERSION(1, 4, 0) -+ while ((prop = ibus_prop_list_get( -+ const_cast<IBusPropList*>( -+ ibus_property_get_sub_props(prop_mozc_tool_)), i++))) { -+ if (!g_strcmp0(property_name, ibus_property_get_key(prop))) { -+#else - while ((prop = ibus_prop_list_get(prop_mozc_tool_->sub_props, i++))) { -- if (!g_strcmp0(property_name, prop->key)) { -+ if (!g_strcmp0(property_name, prop->key)) { -+#endif - const MozcEngineToolProperty *entry = - reinterpret_cast<const MozcEngineToolProperty*>( - g_object_get_data(G_OBJECT(prop), kGObjectDataKey)); -@@ -640,8 +647,15 @@ - } - - i = 0; -+#if IBUS_CHECK_VERSION(1, 4, 0) -+ while ((prop = ibus_prop_list_get( -+ const_cast<IBusPropList*>( -+ ibus_property_get_sub_props(prop_composition_mode_)), i++))) { -+ if (!g_strcmp0(property_name, ibus_property_get_key(prop))) { -+#else - while ((prop = ibus_prop_list_get(prop_composition_mode_->sub_props, i++))) { -- if (!g_strcmp0(property_name, prop->key)) { -+ if (!g_strcmp0(property_name, prop->key)) { -+#endif - const MozcEngineProperty *entry = - reinterpret_cast<const MozcEngineProperty*>( - g_object_get_data(G_OBJECT(prop), kGObjectDataKey)); -@@ -1096,8 +1110,15 @@ - - size_t i = 0; - IBusProperty *prop = NULL; -+#if IBUS_CHECK_VERSION(1, 4, 0) -+ while ((prop = ibus_prop_list_get( -+ const_cast<IBusPropList*>( -+ ibus_property_get_sub_props(prop_composition_mode_)), i++))) { -+ if (!g_strcmp0(entry->key, ibus_property_get_key(prop))) { -+#else - while ((prop = ibus_prop_list_get(prop_composition_mode_->sub_props, i++))) { - if (!g_strcmp0(entry->key, prop->key)) { -+#endif - // Update the language panel. - ibus_property_set_icon(prop_composition_mode_, - GetIconPath(entry->icon).c_str()); |