This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "theslinux-buildsystem".
The branch, uim-vi has been updated
via 4a988a4f06d23ec0ccea3c0a6e522cc98eb1a4f2 (commit)
from 9b1ca12c69c1acb83017539bb192f7a449e1a742 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4a988a4f06d23ec0ccea3c0a6e522cc98eb1a4f2
Author: Ky-Anh Huynh <ky...@theslinux.org>
Date: Thu May 15 16:35:59 2014 +0700
Delete unused patch files
-----------------------------------------------------------------------
Summary of changes:
...-up-some-non-vi-modules-language-supports.patch | 292 --------------------
uim-vi/0002-Add-new-module-xtelex.patch | 55 ----
uim-vi/0003-Add-new-module-xvni.patch | 56 ----
...4-Should-use-.png-instead-of-.svg-for-vni.patch | 25 --
uim-vi/0005-IPA-support-xtelex-ipa-xvni-ipa.patch | 56 ----
...onfig.-to-set-default-mode-for-generic-IM.patch | 86 ------
...-show-candidate-window-via-generic-option.patch | 35 ---
.../2002-m17nlib-now-requires-generic-custom.patch | 29 --
...-some-Japanese-supports-from-toolbar.menu.patch | 57 ----
uim-vi/3002-Remove-state-icon-on-systray.patch | 72 -----
10 files changed, 763 deletions(-)
delete mode 100644
uim-vi/0001-Clean-up-some-non-vi-modules-language-supports.patch
delete mode 100644 uim-vi/0002-Add-new-module-xtelex.patch
delete mode 100644 uim-vi/0003-Add-new-module-xvni.patch
delete mode 100644 uim-vi/0004-Should-use-.png-instead-of-.svg-for-vni.patch
delete mode 100644 uim-vi/0005-IPA-support-xtelex-ipa-xvni-ipa.patch
delete mode 100644 uim-vi/1001-config.-to-set-default-mode-for-generic-IM.patch
delete mode 100644
uim-vi/2001-Hide-show-candidate-window-via-generic-option.patch
delete mode 100644 uim-vi/2002-m17nlib-now-requires-generic-custom.patch
delete mode 100644
uim-vi/3001-Remove-some-Japanese-supports-from-toolbar.menu.patch
delete mode 100644 uim-vi/3002-Remove-state-icon-on-systray.patch
diff --git a/uim-vi/0001-Clean-up-some-non-vi-modules-language-supports.patch
b/uim-vi/0001-Clean-up-some-non-vi-modules-language-supports.patch
deleted file mode 100644
index 5d44642..0000000
--- a/uim-vi/0001-Clean-up-some-non-vi-modules-language-supports.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From 9d045097c5ed5a6d7c651582235b618028117956 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <ky...@theslinux.org>
-Date: Tue, 9 Apr 2013 17:46:51 +0000
-Subject: [PATCH] Clean up some non-vi modules/language supports
-
----
- uim-vi/src/uim-1.8.5/byeoru-data/Makefile.am | 2 +-
- uim-vi/src/uim-1.8.5/pixmaps/Makefile.am | 97 ++++------------------------
- uim-vi/src/uim-1.8.5/po/LINGUAS | 1 -
- uim-vi/src/uim-1.8.5/scm/Makefile.am | 81 ++---------------------
- uim-vi/src/uim-1.8.5/tables/Makefile.am | 4 +-
- 5 files changed, 21 insertions(+), 164 deletions(-)
-
-diff --git a/uim-vi/src/uim-1.8.5/byeoru-data/Makefile.am
b/uim-vi/src/uim-1.8.5/byeoru-data/Makefile.am
-index 7a0063d..26b9066 100644
---- a/uim-vi/src/uim-1.8.5/byeoru-data/Makefile.am
-+++ b/uim-vi/src/uim-1.8.5/byeoru-data/Makefile.am
-@@ -1,5 +1,5 @@
- byeorudatadir = $(pkgdatadir)/byeoru-data
-
--BYEORUDATA = byeoru-dict
-+BYEORUDATA =
-
- dist_byeorudata_DATA = $(BYEORUDATA)
-diff --git a/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
b/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-index af68aa4..24b4489 100644
---- a/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-+++ b/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-@@ -9,113 +9,44 @@ SVGS = unknown.svg
- SVGS += unknown_dark_background.svg
-
- # input methods
--SVGS += direct.svg skk.svg tcode.svg tutcode.svg byeoru.svg wb86.svg zm.svg
-+SVGS += direct.svg
- # dark background
--SVGS += direct_dark_background.svg \
-- skk_dark_background.svg \
-- tcode_dark_background.svg \
-- tutcode_dark_background.svg \
-- wb86_dark_background.svg zm_dark_background.svg
-+SVGS += direct_dark_background.svg
-
- # input modes
--SVGS += direct_input.svg on.svg off.svg \
-- ja_direct.svg ja_hiragana.svg ja_katakana.svg \
-- ja_halfkana.svg \
-- ja_halfwidth_alnum.svg ja_fullwidth_alnum.svg \
-- prime_mode_application.svg \
-- ko_direct.svg ko_hangulchar.svg ko_hangulword.svg
-+SVGS += direct_input.svg on.svg off.svg
-+
- # dark background
- SVGS += direct_input_dark_background.svg \
- on_dark_background.svg \
-- off_dark_background.svg \
-- ja_direct_dark_background.svg \
-- ja_hiragana_dark_background.svg \
-- ja_katakana_dark_background.svg \
-- ja_halfkana_dark_background.svg \
-- ja_halfwidth_alnum_dark_background.svg \
-- ja_fullwidth_alnum_dark_background.svg \
-- prime_mode_application_dark_background.svg \
-- ko_direct_dark_background.svg \
-- ko_hangulchar_dark_background.svg \
-- ko_hangulword_dark_background.svg
--
--# Japanese kana input methods
--SVGS += ja_romaji.svg ja_kana.svg ja_azik.svg ja_act.svg ja_kzik.svg \
-- ja_nicola.svg ja_pocketbell.svg
--# dark background
--SVGS += ja_romaji_dark_background.svg \
-- ja_kana_dark_background.svg \
-- ja_azik_dark_background.svg \
-- ja_act_dark_background.svg \
-- ja_kzik_dark_background.svg
-+ off_dark_background.svg
-
- # Tools
- SVGS += im_switcher.svg uim-dict.svg
-
- # input method substitutions
--IM_SUBST_SVGS = py.svg pyunihan.svg pinyin-big5.svg \
-- mana.svg \
-- hangul2.svg hangul3.svg romaja.svg \
-- viqr.svg ipa-x-sampa.svg latin.svg elatin.svg \
-- look.svg scim.svg sj3.svg wnn.svg \
-- social-ime.svg ajax-ime.svg yahoo-jp.svg \
-- google-cgiapi-jp.svg baidu-olime-jp.svg
--GENERATED_SVGS = $(IM_SUBST_SVGS) trycode.svg trycode_dark_background.svg
-+IM_SUBST_SVGS = viqr.svg ipa-x-sampa.svg scim.svg
-+
-+GENERATED_SVGS = $(IM_SUBST_SVGS)
- SVGS += im_subst.svg $(GENERATED_SVGS)
-
--IM_SUBST_PNGS = py.png pyunihan.png pinyin-big5.png \
-- mana.png \
-- hangul2.png hangul3.png romaja.png \
-- viqr.png ipa-x-sampa.png latin.png elatin.png \
-- look.png scim.png sj3.png wnn.png \
-- social-ime.png ajax-ime.png yahoo-jp.png \
-- google-cgiapi-jp.png baidu-olime-jp.png
-+IM_SUBST_PNGS = viqr.png ipa-x-sampa.png scim.png
-
- SVG_PNGS = unknown.png \
-- direct.png skk.png tcode.png tutcode.png trycode.png byeoru.png \
-+ direct.png \
- direct_input.png on.png off.png \
-- ja_direct.png ja_hiragana.png ja_katakana.png \
-- ja_halfkana.png \
-- ja_halfwidth_alnum.png ja_fullwidth_alnum.png \
-- prime_mode_application.png \
-- ko_direct.png ko_hangulchar.png ko_hangulword.png \
-- ja_romaji.png ja_kana.png ja_azik.png ja_act.png ja_kzik.png \
-- ja_nicola.png \
-- ja_pocketbell.png \
-- wb86.png zm.png \
- im_switcher.png uim-dict.png $(IM_SUBST_PNGS) \
- unknown_dark_background.png \
- direct_dark_background.png \
-- skk_dark_background.png \
-- tcode_dark_background.png \
-- tutcode_dark_background.png \
-- trycode_dark_background.png \
-- wb86_dark_background.png \
-- zm_dark_background.png \
- direct_input_dark_background.png \
- on_dark_background.png \
-- off_dark_background.png \
-- ja_direct_dark_background.png \
-- ja_hiragana_dark_background.png \
-- ja_katakana_dark_background.png \
-- ja_halfkana_dark_background.png \
-- ja_halfwidth_alnum_dark_background.png \
-- ja_fullwidth_alnum_dark_background.png \
-- prime_mode_application_dark_background.png \
-- ko_direct_dark_background.png \
-- ko_hangulchar_dark_background.png \
-- ko_hangulword_dark_background.png \
-- ja_romaji_dark_background.png \
-- ja_kana_dark_background.png \
-- ja_azik_dark_background.png \
-- ja_act_dark_background.png \
-- ja_kzik_dark_background.png
-+ off_dark_background.png
-
- NATIVE_PNGS = null.png uim-icon64.png uim-icon48.png uim-gray.png
-
--SCIM_PNGS = scim-anthy.png scim-canna.png scim-prime.png \
-- scim-skk.png scim-wnn.png
--SCIM_ORIGINATED_PNGS = anthy.png canna.png prime.png
-+SCIM_PNGS =
-+
-+SCIM_ORIGINATED_PNGS =
- if ANTHY_UTF8
- SCIM_ORIGINATED_PNGS += anthy-utf8.png
- endif
-diff --git a/uim-vi/src/uim-1.8.5/po/LINGUAS b/uim-vi/src/uim-1.8.5/po/LINGUAS
-index 4eb4f64..e69de29 100644
---- a/uim-vi/src/uim-1.8.5/po/LINGUAS
-+++ b/uim-vi/src/uim-1.8.5/po/LINGUAS
-@@ -1 +0,0 @@
--fr ja ko
-diff --git a/uim-vi/src/uim-1.8.5/scm/Makefile.am
b/uim-vi/src/uim-1.8.5/scm/Makefile.am
-index 14d9393..331b219 100644
---- a/uim-vi/src/uim-1.8.5/scm/Makefile.am
-+++ b/uim-vi/src/uim-1.8.5/scm/Makefile.am
-@@ -17,41 +17,9 @@ SCM_FILES = plugin.scm im.scm im-custom.scm lazy-load.scm
init.scm \
- rk.scm \
- generic.scm generic-custom.scm generic-key-custom.scm \
- generic-predict.scm predict-custom.scm \
-- predict-look.scm predict-look-skk.scm predict-sqlite3.scm \
-- predict-google-suggest.scm \
-- pyload.scm py.scm pyunihan.scm pinyin-big5.scm \
-- xmload.scm \
-- japanese.scm japanese-azik.scm japanese-kana.scm \
-- japanese-act.scm japanese-kzik.scm japanese-custom.scm \
-- anthy.scm anthy-custom.scm anthy-key-custom.scm \
-- anthy-utf8.scm anthy-utf8-custom.scm \
-- canna.scm cannav3-socket.scm canna-custom.scm canna-key-custom.scm \
-- wnn.scm wnn-custom.scm wnn-key-custom.scm \
-- sj3.scm sj3-custom.scm sj3-key-custom.scm sj3v2-socket.scm \
-- prime.scm prime-custom.scm prime-key-custom.scm \
-- skk.scm skk-editor.scm skk-custom.scm skk-key-custom.scm skk-dialog.scm \
-- mana.scm mana-custom.scm mana-key-custom.scm \
-- tcode.scm trycode.scm \
-- tutcode.scm tutcode-custom.scm tutcode-key-custom.scm tutcode-bushu.scm \
-- tutcode-bushudic.scm tutcode-rule.scm tutcode-kigoudic.scm \
-- tutcode-editor.scm tutcode-dialog.scm tutcode-kigou-rule.scm \
-- tutcode-rule-custom.scm \
-- hangul.scm hangul2.scm hangul3.scm romaja.scm \
-- byeoru.scm byeoru-symbols.scm \
-- byeoru-custom.scm byeoru-key-custom.scm \
- viqr.scm \
- ipa-x-sampa.scm \
-- latin.scm \
-- elatin.scm elatin-rules.scm elatin-custom.scm \
-- look.scm look-custom.scm \
- m17nlib.scm m17nlib-custom.scm \
-- zaurus.scm \
-- scim.scm \
-- social-ime.scm social-ime-custom.scm social-ime-key-custom.scm \
-- ajax-ime.scm ajax-ime-custom.scm ajax-ime-key-custom.scm \
-- yahoo-jp.scm yahoo-jp-custom.scm yahoo-jp-key-custom.scm \
-- google-cgiapi-jp.scm google-cgiapi-jp-custom.scm
google-cgiapi-jp-key-custom.scm \
-- baidu-olime-jp.scm baidu-olime-jp-custom.scm baidu-olime-jp-key-custom.scm \
- uim-module-manager.scm \
- fileio.scm socket.scm process.scm \
- openssl.scm \
-@@ -62,62 +30,21 @@ SCM_FILES = plugin.scm im.scm im-custom.scm lazy-load.scm
init.scm \
- json.scm json-parser-expanded.scm \
- http-client.scm http-server.scm \
- sxml-tools.scm sxpathlib.scm \
-- annotation.scm annotation-custom.scm annotation-dict.scm annotation-eb.scm \
-- annotation-filter.scm annotation-osx-dcs.scm \
-+ annotation.scm annotation-custom.scm annotation-dict.scm \
-+ annotation-filter.scm \
- dynlib.scm \
- ct.scm \
- dict-socket.scm
-
- OTHER_SCM_FILES = \
-- wb86.scm zm.scm \
- macro-expander.scm macro-expander-chicken.scm \
- json-parser-expander.scm json.scm.in packrat.scm.in
-+
- EXTRA_DIST = $(OTHER_SCM_FILES)
-
- ETAGS_ARGS=$(SCM_FILES) $(GENERATED_SCM_FILES)
-
--module_names =
--if ANTHY
-- module_names += "anthy"
--endif
--if ANTHY_UTF8
-- module_names += "anthy-utf8"
--endif
--if CANNA
-- module_names += "canna"
--endif
--if WNN
-- module_names += "wnn"
--endif
--if MANA
-- module_names += "mana"
--endif
--if PRIME
-- module_names += "prime"
--endif
--if SJ3
-- module_names += "sj3"
--endif
--if SKK
-- module_names += "skk"
--endif
--#module_names += "tcode" "trycode"
--module_names += "tutcode" "byeoru" "latin" "elatin"
--if M17NLIB
-- module_names += "m17nlib"
--endif
--module_names += "xmload"
--# less preferable IMs
--module_names += "pyload" "viqr" "ipa-x-sampa" "look"
--#"hangul"
--if SCIM
-- module_names += "scim"
--endif
--# web based IMs
-- module_names += "ajax-ime" "social-ime" "google-cgiapi-jp" "baidu-olime-jp"
--if EXPAT
-- module_names += "yahoo-jp"
--endif
-+module_names = "m17nlib" "viqr" "ipa-x-sampa"
-
- UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager
- UIM_MODULE_MANAGER_ENV = \
-diff --git a/uim-vi/src/uim-1.8.5/tables/Makefile.am
b/uim-vi/src/uim-1.8.5/tables/Makefile.am
-index 33d95f9..73a5338 100644
---- a/uim-vi/src/uim-1.8.5/tables/Makefile.am
-+++ b/uim-vi/src/uim-1.8.5/tables/Makefile.am
-@@ -1,7 +1,7 @@
- tablesdir = $(pkgdatadir)/tables
-
--SCMS = wb86.scm zm.scm
--SCM_TABLES = wb86.table zm.table
-+SCMS =
-+SCM_TABLES =
-
- NATIVE_TABLES =
-
---
-1.8.3
-
diff --git a/uim-vi/0002-Add-new-module-xtelex.patch
b/uim-vi/0002-Add-new-module-xtelex.patch
deleted file mode 100644
index 71a43b7..0000000
--- a/uim-vi/0002-Add-new-module-xtelex.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From df04775feb13d9eabe595c34bc6c33ed3c8ae9d1 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <ky...@theslinux.org>
-Date: Thu, 11 Apr 2013 13:43:38 +0000
-Subject: [PATCH] Add new module :xtelex
-
-This module is a big table of predefined words for Telex users.
-Pls check details at https://github.com/icy/myquartz-scim2uim
----
- uim-vi/src/uim-1.8.5/pixmaps/Makefile.am | 4 ++--
- uim-vi/src/uim-1.8.5/scm/Makefile.am | 3 ++-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
b/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-index 24b4489..46a4324 100644
---- a/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-+++ b/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-@@ -25,12 +25,12 @@ SVGS += direct_input_dark_background.svg \
- SVGS += im_switcher.svg uim-dict.svg
-
- # input method substitutions
--IM_SUBST_SVGS = viqr.svg ipa-x-sampa.svg scim.svg
-+IM_SUBST_SVGS = xtelex.svg viqr.svg ipa-x-sampa.svg scim.svg
-
- GENERATED_SVGS = $(IM_SUBST_SVGS)
- SVGS += im_subst.svg $(GENERATED_SVGS)
-
--IM_SUBST_PNGS = viqr.png ipa-x-sampa.png scim.png
-+IM_SUBST_PNGS = xtelex.png viqr.png ipa-x-sampa.png scim.png
-
- SVG_PNGS = unknown.png \
- direct.png \
-diff --git a/uim-vi/src/uim-1.8.5/scm/Makefile.am
b/uim-vi/src/uim-1.8.5/scm/Makefile.am
-index 331b219..636691f 100644
---- a/uim-vi/src/uim-1.8.5/scm/Makefile.am
-+++ b/uim-vi/src/uim-1.8.5/scm/Makefile.am
-@@ -18,6 +18,7 @@ SCM_FILES = plugin.scm im.scm im-custom.scm lazy-load.scm
init.scm \
- generic.scm generic-custom.scm generic-key-custom.scm \
- generic-predict.scm predict-custom.scm \
- viqr.scm \
-+ xtelex.scm \
- ipa-x-sampa.scm \
- m17nlib.scm m17nlib-custom.scm \
- uim-module-manager.scm \
-@@ -44,7 +45,7 @@ EXTRA_DIST = $(OTHER_SCM_FILES)
-
- ETAGS_ARGS=$(SCM_FILES) $(GENERATED_SCM_FILES)
-
--module_names = "m17nlib" "viqr" "ipa-x-sampa"
-+module_names = "m17nlib" "viqr" "xtelex" "ipa-x-sampa"
-
- UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager
- UIM_MODULE_MANAGER_ENV = \
---
-1.8.3
-
diff --git a/uim-vi/0003-Add-new-module-xvni.patch
b/uim-vi/0003-Add-new-module-xvni.patch
deleted file mode 100644
index 7e3c022..0000000
--- a/uim-vi/0003-Add-new-module-xvni.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2db90b14131b52f17615d812c3ac3bae6a150a09 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <ky...@theslinux.org>
-Date: Fri, 12 Apr 2013 08:05:41 +0000
-Subject: [PATCH] Add new module :xvni
-
-This module is a big table of predefined words for VNI users.
-It is genereated from https://github.com/icy/myquartz-scim2uim/ \
- blob/master/src/VNI.txt.in
----
- uim-vi/src/uim-1.8.5/pixmaps/Makefile.am | 4 ++--
- uim-vi/src/uim-1.8.5/scm/Makefile.am | 3 ++-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
b/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-index 46a4324..c3a2792 100644
---- a/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-+++ b/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-@@ -25,12 +25,12 @@ SVGS += direct_input_dark_background.svg \
- SVGS += im_switcher.svg uim-dict.svg
-
- # input method substitutions
--IM_SUBST_SVGS = xtelex.svg viqr.svg ipa-x-sampa.svg scim.svg
-+IM_SUBST_SVGS = xvni.svg xtelex.svg viqr.svg ipa-x-sampa.svg scim.svg
-
- GENERATED_SVGS = $(IM_SUBST_SVGS)
- SVGS += im_subst.svg $(GENERATED_SVGS)
-
--IM_SUBST_PNGS = xtelex.png viqr.png ipa-x-sampa.png scim.png
-+IM_SUBST_PNGS = xvni.svg xtelex.png viqr.png ipa-x-sampa.png scim.png
-
- SVG_PNGS = unknown.png \
- direct.png \
-diff --git a/uim-vi/src/uim-1.8.5/scm/Makefile.am
b/uim-vi/src/uim-1.8.5/scm/Makefile.am
-index 636691f..2256e1d 100644
---- a/uim-vi/src/uim-1.8.5/scm/Makefile.am
-+++ b/uim-vi/src/uim-1.8.5/scm/Makefile.am
-@@ -19,6 +19,7 @@ SCM_FILES = plugin.scm im.scm im-custom.scm lazy-load.scm
init.scm \
- generic-predict.scm predict-custom.scm \
- viqr.scm \
- xtelex.scm \
-+ xvni.scm \
- ipa-x-sampa.scm \
- m17nlib.scm m17nlib-custom.scm \
- uim-module-manager.scm \
-@@ -45,7 +46,7 @@ EXTRA_DIST = $(OTHER_SCM_FILES)
-
- ETAGS_ARGS=$(SCM_FILES) $(GENERATED_SCM_FILES)
-
--module_names = "m17nlib" "viqr" "xtelex" "ipa-x-sampa"
-+module_names = "m17nlib" "viqr" "xvni" "xtelex" "ipa-x-sampa"
-
- UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager
- UIM_MODULE_MANAGER_ENV = \
---
-1.8.3
-
diff --git a/uim-vi/0004-Should-use-.png-instead-of-.svg-for-vni.patch
b/uim-vi/0004-Should-use-.png-instead-of-.svg-for-vni.patch
deleted file mode 100644
index ed2e55a..0000000
--- a/uim-vi/0004-Should-use-.png-instead-of-.svg-for-vni.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cb0e841a0a3cba64df57eb09dc536277a0c1cc23 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <ky...@theslinux.org>
-Date: Fri, 12 Apr 2013 08:20:32 +0000
-Subject: [PATCH] Should use .png instead of .svg for vni
-
----
- uim-vi/src/uim-1.8.5/pixmaps/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
b/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-index c3a2792..c363d2c 100644
---- a/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-+++ b/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-@@ -30,7 +30,7 @@ IM_SUBST_SVGS = xvni.svg xtelex.svg viqr.svg ipa-x-sampa.svg
scim.svg
- GENERATED_SVGS = $(IM_SUBST_SVGS)
- SVGS += im_subst.svg $(GENERATED_SVGS)
-
--IM_SUBST_PNGS = xvni.svg xtelex.png viqr.png ipa-x-sampa.png scim.png
-+IM_SUBST_PNGS = xvni.png xtelex.png viqr.png ipa-x-sampa.png scim.png
-
- SVG_PNGS = unknown.png \
- direct.png \
---
-1.8.3
-
diff --git a/uim-vi/0005-IPA-support-xtelex-ipa-xvni-ipa.patch
b/uim-vi/0005-IPA-support-xtelex-ipa-xvni-ipa.patch
deleted file mode 100644
index 8e45ee4..0000000
--- a/uim-vi/0005-IPA-support-xtelex-ipa-xvni-ipa.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 4623e44eafd196a84966f8bbfe6712811b4e98b9 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <ky...@theslinux.org>
-Date: Sat, 4 May 2013 10:06:41 +0700
-Subject: [PATCH] + IPA support xtelex-ipa, xvni-ipa
-
----
- uim-vi/src/uim-1.8.5/pixmaps/Makefile.am | 6 ++++--
- uim-vi/src/uim-1.8.5/scm/Makefile.am | 4 +++-
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
b/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-index c363d2c..4b92692 100644
---- a/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-+++ b/uim-vi/src/uim-1.8.5/pixmaps/Makefile.am
-@@ -25,12 +25,14 @@ SVGS += direct_input_dark_background.svg \
- SVGS += im_switcher.svg uim-dict.svg
-
- # input method substitutions
--IM_SUBST_SVGS = xvni.svg xtelex.svg viqr.svg ipa-x-sampa.svg scim.svg
-+IM_SUBST_SVGS = xvni.svg xtelex.svg viqr.svg ipa-x-sampa.svg scim.svg \
-+ xvni-ipa.svg xtelex-ipa.svg
-
- GENERATED_SVGS = $(IM_SUBST_SVGS)
- SVGS += im_subst.svg $(GENERATED_SVGS)
-
--IM_SUBST_PNGS = xvni.png xtelex.png viqr.png ipa-x-sampa.png scim.png
-+IM_SUBST_PNGS = xvni.png xtelex.png viqr.png ipa-x-sampa.png scim.png \
-+ xvni-ipa.png xtelex-ipa.png
-
- SVG_PNGS = unknown.png \
- direct.png \
-diff --git a/uim-vi/src/uim-1.8.5/scm/Makefile.am
b/uim-vi/src/uim-1.8.5/scm/Makefile.am
-index 2256e1d..0a18a3d 100644
---- a/uim-vi/src/uim-1.8.5/scm/Makefile.am
-+++ b/uim-vi/src/uim-1.8.5/scm/Makefile.am
-@@ -20,6 +20,8 @@ SCM_FILES = plugin.scm im.scm im-custom.scm lazy-load.scm
init.scm \
- viqr.scm \
- xtelex.scm \
- xvni.scm \
-+ xtelex-ipa.scm \
-+ xvni-ipa.scm \
- ipa-x-sampa.scm \
- m17nlib.scm m17nlib-custom.scm \
- uim-module-manager.scm \
-@@ -46,7 +48,7 @@ EXTRA_DIST = $(OTHER_SCM_FILES)
-
- ETAGS_ARGS=$(SCM_FILES) $(GENERATED_SCM_FILES)
-
--module_names = "m17nlib" "viqr" "xvni" "xtelex" "ipa-x-sampa"
-+module_names = "m17nlib" "viqr" "xvni" "xtelex" "ipa-x-sampa" "xtelex-ipa"
"xvni-ipa"
-
- UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager
- UIM_MODULE_MANAGER_ENV = \
---
-1.8.3
-
diff --git a/uim-vi/1001-config.-to-set-default-mode-for-generic-IM.patch
b/uim-vi/1001-config.-to-set-default-mode-for-generic-IM.patch
deleted file mode 100644
index 4e24f62..0000000
--- a/uim-vi/1001-config.-to-set-default-mode-for-generic-IM.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From e8a99cbfd755b890dece6a4412487f9621c7d59c Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <ky...@theslinux.org>
-Date: Tue, 30 Apr 2013 15:07:18 +0700
-Subject: [PATCH] + config. to set default mode for generic IM
-
-New configuration option allows user to select default mode
-for generic IM. This is useful but it may be buggy if some IM
-has its own configuration to do the samething.
-
-FIXME: Add test cases
----
- uim-vi/src/uim-1.8.5/scm/generic-custom.scm | 6 ++++++
- uim-vi/src/uim-1.8.5/scm/generic.scm | 10 ++++++++--
- uim-vi/src/uim-1.8.5/scm/im-custom.scm | 5 +++++
- 3 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/uim-vi/src/uim-1.8.5/scm/generic-custom.scm
b/uim-vi/src/uim-1.8.5/scm/generic-custom.scm
-index 0b6811d..4505076 100644
---- a/uim-vi/src/uim-1.8.5/scm/generic-custom.scm
-+++ b/uim-vi/src/uim-1.8.5/scm/generic-custom.scm
-@@ -36,6 +36,12 @@
- (N_ "Other input methods")
- (N_ "long description will be here."))
-
-+(define-custom 'generic-im-default-state-on? #f
-+ '(other-ims miscellaneous)
-+ '(boolean)
-+ (N_ "Default input mode is on")
-+ (N_ "long description will be here."))
-+
- (define-custom 'generic-use-candidate-window? #t
- '(other-ims candwin)
- '(boolean)
-diff --git a/uim-vi/src/uim-1.8.5/scm/generic.scm
b/uim-vi/src/uim-1.8.5/scm/generic.scm
-index d632c10..e287756 100644
---- a/uim-vi/src/uim-1.8.5/scm/generic.scm
-+++ b/uim-vi/src/uim-1.8.5/scm/generic.scm
-@@ -40,14 +40,17 @@
- (define generic-widgets '(widget_generic_input_mode))
-
- ;; default activity for each widgets
--(define default-widget_generic_input_mode 'action_generic_off)
-+(define default-widget_generic_input_mode
-+ (cond
-+ (generic-im-default-state-on? 'action_generic_on)
-+ (else 'action_generic_off)
-+ ))
-
- ;; actions of widget_generic_input_mode
- (define generic-input-mode-actions
- '(action_generic_off
- action_generic_on))
-
--
- ;;; implementations
-
- (define ascii-rule
-@@ -61,6 +64,9 @@
- (lambda (gc)
- (let ((rkc (generic-context-rk-context gc)))
- (rk-flush rkc)
-+ (cond
-+ (generic-im-default-state-on? 'action_generic_on)
-+ (else 'action_generic_off))
- (generic-update-preedit gc))))
-
- (register-action 'action_generic_off
-diff --git a/uim-vi/src/uim-1.8.5/scm/im-custom.scm
b/uim-vi/src/uim-1.8.5/scm/im-custom.scm
-index fed60d4..3b161a6 100644
---- a/uim-vi/src/uim-1.8.5/scm/im-custom.scm
-+++ b/uim-vi/src/uim-1.8.5/scm/im-custom.scm
-@@ -86,6 +86,11 @@
- (N_ "long description will be here."))
-
- ;; subgroup
-+(define-custom-group 'miscellaneous
-+ (N_ "Miscellaneous settings")
-+ (N_ "long description will be here."))
-+
-+;; subgroup
- (define-custom-group 'dictionary
- (N_ "Dictionary")
- (N_ "long description will be here."))
---
-1.8.2.1
-
diff --git a/uim-vi/2001-Hide-show-candidate-window-via-generic-option.patch
b/uim-vi/2001-Hide-show-candidate-window-via-generic-option.patch
deleted file mode 100644
index cc24030..0000000
--- a/uim-vi/2001-Hide-show-candidate-window-via-generic-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fef061382e7ddb9332b3244db260b33b7ff37824 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <ky...@theslinux.org>
-Date: Sat, 27 Apr 2013 03:59:01 +0700
-Subject: [PATCH 2001/2002] Hide/show candidate window via generic option
-
-Adding a new option to "m17nlib.scm" to add new option is
-still possible, however we just need to use the known option.
-This may cause confusion, because "Other input methods" (that
-is that name of "Generic") often excludes "m17n-lib". So
-it is a feature (possibly a bug) that "m17n-lib" uses a
-generic option for its. This also requires dependencies,
-and we will not be able to have a separated settings for "m
-17n-lib". This is almost good, bc. showing/hiding the window
-for candidates may be a personal setting: someone just likes
-to see them all (for any input methods/settings), while some
-others just like to see nothing
----
- uim-vi/src/uim-1.8.5/scm/m17nlib.scm | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/uim-vi/src/uim-1.8.5/scm/m17nlib.scm
b/uim-vi/src/uim-1.8.5/scm/m17nlib.scm
-index 3f413db..7dba894 100644
---- a/uim-vi/src/uim-1.8.5/scm/m17nlib.scm
-+++ b/uim-vi/src/uim-1.8.5/scm/m17nlib.scm
-@@ -142,6 +142,7 @@
- (m17nlib-context-set-showing-candidate! mc #f)))
-
- (if (and
-+ generic-use-candidate-window?
- (or
- candidates-changed?
- (and
---
-1.8.3
-
diff --git a/uim-vi/2002-m17nlib-now-requires-generic-custom.patch
b/uim-vi/2002-m17nlib-now-requires-generic-custom.patch
deleted file mode 100644
index ce89b36..0000000
--- a/uim-vi/2002-m17nlib-now-requires-generic-custom.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 11f77051bf016a9a79bf650ca0ffe1d86df63eaf Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <ky...@theslinux.org>
-Date: Sat, 4 May 2013 10:52:04 +0700
-Subject: [PATCH 2002/2002] m17nlib now requires :generic-custom
-
-This is bc we want to use :generic-use-candidate-window?
--- that variable is defined in "generic-custom".
-
-A dicussion on this topic can be found on Github
- https://github.com/uim/uim/pull/25
----
- uim-vi/src/uim-1.8.5/scm/m17nlib.scm | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/uim-vi/src/uim-1.8.5/scm/m17nlib.scm
b/uim-vi/src/uim-1.8.5/scm/m17nlib.scm
-index 7dba894..09d5c7d 100644
---- a/uim-vi/src/uim-1.8.5/scm/m17nlib.scm
-+++ b/uim-vi/src/uim-1.8.5/scm/m17nlib.scm
-@@ -30,6 +30,7 @@
-
- (require-custom "generic-key-custom.scm")
- (require-custom "m17nlib-custom.scm")
-+(require-custom "generic-custom.scm")
-
- ;;; user configs
-
---
-1.8.3
-
diff --git a/uim-vi/3001-Remove-some-Japanese-supports-from-toolbar.menu.patch
b/uim-vi/3001-Remove-some-Japanese-supports-from-toolbar.menu.patch
deleted file mode 100644
index 67e60b2..0000000
--- a/uim-vi/3001-Remove-some-Japanese-supports-from-toolbar.menu.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 63a79a81097717f6bbb5e362aaf2839c2797f480 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <ky...@theslinux.org>
-Date: Sun, 18 Aug 2013 22:04:21 +0700
-Subject: [PATCH 3001/3002] Remove some Japanese supports from :toolbar.menu
-
-They are:
-* Japanese dictionary editor
-* Handwriting input pad
-
-The configuration directives disable support for them, so they
-actually do not work when user select them from the menu.
-
-We use :UIM_VI_NO_CLEAN_UP to disable the items. To turn them
-on, you need to define that macro at the configuration time
----
- uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
b/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
-index 177bb3b..2d2a97f 100644
---- a/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
-+++ b/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
-@@ -109,6 +109,7 @@ static struct _CommandEntry command_entry[] = {
- UIM_FALSE
- },
-
-+#ifdef UIM_VI_NO_CLEAN_UP
- {
- N_("Japanese dictionary editor"),
- NULL,
-@@ -121,6 +122,7 @@ static struct _CommandEntry command_entry[] = {
- "toolbar-show-dict-button?",
- UIM_FALSE
- },
-+#endif
-
- {
- N_("Input pad"),
-@@ -135,6 +137,7 @@ static struct _CommandEntry command_entry[] = {
- UIM_FALSE
- },
-
-+#ifdef UIM_VI_NO_CLEAN_UP
- {
- N_("Handwriting input pad"),
- "H",
-@@ -147,6 +150,7 @@ static struct _CommandEntry command_entry[] = {
- "toolbar-show-handwriting-input-pad-button?",
- UIM_FALSE
- },
-+#endif
-
- {
- N_("Help"),
---
-1.8.3
-
diff --git a/uim-vi/3002-Remove-state-icon-on-systray.patch
b/uim-vi/3002-Remove-state-icon-on-systray.patch
deleted file mode 100644
index 5ea873c..0000000
--- a/uim-vi/3002-Remove-state-icon-on-systray.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From cc1d56c1f4c63645f9682db6634c77e72b810f47 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <ky...@theslinux.org>
-Date: Sun, 18 Aug 2013 22:46:54 +0700
-Subject: [PATCH 3002/3002] Remove :state icon on systray
-
-The systray has two groups (aka :branches) of icons on systray.
-One is to list all IMs, the other is to indicate the state of the
-current IM (on, off, or direct_input). There may be some other
-group but I do not know.
-
-Because we tell :uim to switch to :direct_input as an alternative
-of :toggle action, we do not really need a second icon to show
-the same thing. We just remove them, and this will make the icon
-bigger/viewable on the systray. The combination "^ Alt \" is
-still valid: it can be used to switch :telex <-> :vni. Note that
-some user option may make new feature buggy. Also note that we
-only test this feature on :Gtk2, but :Gtk3 should work, too.
-
-I spent my two days (sat & sun) to figure out how I can patch.
-I first thought there are some Gtk code that creates two groups.
-Unfortunately that is completely wrong. The :toolbar reads the
-instructions from :uim_fd (file descriptor that contains control
-messages), and parses the messages to create buttons and icons
-for the systray. See (helper_toolbar_prop_list_update). That
-is why you see lines that use (strcmp) to check if the current
-message/line wants to create a :branch (:group) or :leaf (icon)
----
- uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
b/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
-index 2d2a97f..30bdf7a 100644
---- a/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
-+++ b/uim-vi/src/uim-1.8.5/gtk2/toolbar/common-gtk.c
-@@ -781,6 +781,10 @@ helper_toolbar_prop_list_update(GtkWidget *widget, gchar
**lines)
- indication_id = cols[1];
- iconic_label = safe_gettext(cols[2]);
- tooltip_str = safe_gettext(cols[3]);
-+ if (strcmp("direct_input", indication_id)
-+ && strcmp("on", indication_id)
-+ && strcmp("off", indication_id))
-+ {
- button = prop_button_create(widget,
- indication_id, iconic_label, tooltip_str);
- append_prop_button(widget, button);
-@@ -789,6 +793,7 @@ helper_toolbar_prop_list_update(GtkWidget *widget, gchar
**lines)
- || g_str_has_suffix(indication_id, "_direct"))) {
- is_hidden = TRUE;
- }
-+ }
- } else if (!strcmp("leaf", cols[0]) && has_n_strs(cols, 7)) {
- indication_id = cols[1];
- iconic_label = safe_gettext(cols[2]);
-@@ -796,10 +801,15 @@ helper_toolbar_prop_list_update(GtkWidget *widget, gchar
**lines)
- tooltip_str = safe_gettext(cols[4]);
- action_id = cols[5];
- is_selected = cols[6];
-+ if (strcmp("direct_input", indication_id)
-+ && strcmp("on", indication_id)
-+ && strcmp("off", indication_id))
-+ {
- prop_button_append_menu(button,
- indication_id, label, tooltip_str, action_id,
- is_selected);
- }
-+ }
- g_strfreev(cols);
- }
- }
---
-1.8.3
-
hooks/post-receive
--
theslinux-buildsystem
--
To ubsubscribe from the list phantom@lists.theslinux.org,
please send an email to ecar...@lists.theslinux.org with subject
ubsubscribe phantom
To get basic commands to use Ecartis system, use subject 'help'.
