diff --git a/debian/changelog b/debian/changelog index cbf2710..379c9ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ * New upstream release (r105). * Update patches/support-kfreebsd.patch. + * Remove unnecessary patches. + - patches/add_tegaki_ui_scim_mozc.patch + - patches/add_tegaki_ui_ibus_mozc.patch -- Nobuhiro Iwamatsu Wed, 28 Mar 2012 12:34:56 +0900 diff --git a/debian/patches/add_tegaki_ui_ibus_mozc.patch b/debian/patches/add_tegaki_ui_ibus_mozc.patch deleted file mode 100644 index d630b19..0000000 --- a/debian/patches/add_tegaki_ui_ibus_mozc.patch +++ /dev/null @@ -1,35 +0,0 @@ -Description: Add tegaki UI for ibus mozc. -Forwarded: none -Author: Nobuhiro iwamatsu -Last-Update: 2011-12-06 - - -diff --git a/unix/ibus/mozc_engine_property.cc b/unix/ibus/mozc_engine_property.cc -index 63bb411..29a0d8e 100755 ---- a/unix/ibus/mozc_engine_property.cc -+++ b/unix/ibus/mozc_engine_property.cc -@@ -121,6 +121,24 @@ const MozcEngineToolProperty kMozcEngineToolProperties[] = { - "character_palette.png", - }, - { -+ "Tool.WordRegisterDialog", -+ "word_register_dialog", -+ "Word register tool", -+ NULL, -+ }, -+ { -+ "Tool.InputPad", -+ "character_palette", -+ "Character Input palette", -+ NULL, -+ }, -+ { -+ "Tool.HandWriting", -+ "hand_writing", -+ "Hand-written character recognition", -+ NULL, -+ }, -+ { - "Tool.AboutDialog", - "about_dialog", - "About Mozc", diff --git a/debian/patches/add_tegaki_ui_scim_mozc.patch b/debian/patches/add_tegaki_ui_scim_mozc.patch deleted file mode 100644 index 773942e..0000000 --- a/debian/patches/add_tegaki_ui_scim_mozc.patch +++ /dev/null @@ -1,35 +0,0 @@ -Description: Add tegaki UI for scim mozc. -Forwarded: none -Author: Nobuhiro iwamatsu -Last-Update: 2011-10-04 - -diff --git a/unix/scim/scim_mozc.cc b/unix/scim/scim_mozc.cc -index 742aa3f..2fa0218 100755 ---- a/unix/scim/scim_mozc.cc -+++ b/unix/scim/scim_mozc.cc -@@ -48,6 +48,12 @@ const char kPropTool[] = "/Mozc/Tool"; - const char kPropToolIcon[] = SCIM_ICONDIR "/scim-mozc-tool.png"; - const char kPropToolDictionary[] = "/Mozc/Tool/dictionary"; - const char kPropToolDictionaryIcon[] = SCIM_ICONDIR "/scim-mozc-dictionary.png"; -+const char kPropToolWordregister[] = "/Mozc/Tool/wordregister"; -+const char kPropToolWordregisterIcon[] = ""; -+const char kPropToolInputpad[] = "/Mozc/Tool/inputpad"; -+const char kPropToolInputpadIcon[] = ""; -+const char kPropToolHandwriting[] = "/Mozc/Tool/handwriting"; -+const char kPropToolHandwritingIcon[] = ""; - const char kPropToolProperty[] = "/Mozc/Tool/property"; - const char kPropToolPropertyIcon[] = SCIM_ICONDIR "/scim-mozc-properties.png"; - -@@ -260,6 +266,12 @@ void ScimMozc::trigger_property(const scim::String &property) { - args = "--mode=dictionary_tool"; - } else if (property == kPropToolProperty) { - args = "--mode=config_dialog"; -+ } else if (property == kPropToolWordregister) { -+ args = "--mode=word_register_dialog"; -+ } else if (property == kPropToolInputpad) { -+ args = "--mode=character_palette"; -+ } else if (property == kPropToolHandwriting) { -+ args = "--mode=hand_writing"; - } else { - // Unknown property. - return; diff --git a/debian/patches/series b/debian/patches/series index a64559a..4f78b9d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ support-kfreebsd.patch uim-mozc.patch # add_file_to_gypfile_check.patch -add_tegaki_ui_scim_mozc.patch -add_tegaki_ui_ibus_mozc.patch