theslinux-buildsystem branch uim-vi updated 957584a Split big patch file into chunks
- From: git@xxxxxxxxxxxxxxxxxxxx
- To: theslinux-phantom@xxxxxxxxxxxxx
- Date: Sun, 18 Aug 2013 07:44:41 -0700
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 957584ad78a75592cee1af5baa717923ee9543dc (commit)
via a7d70432a4cdc0c963383cd6ac8207251eee6d02 (commit)
via de46e6b1996d87c6ea1fa0cfe8ca8fb9e4aa3a9b (commit)
from b63151cae7cb449f7762fcf27cd19b80c6a64879 (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 957584ad78a75592cee1af5baa717923ee9543dc
Author: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
Date: Sun Aug 18 21:42:18 2013 +0700
Split big patch file into chunks
Old file :uim-vi-m17n-candidate-window. New files: 200*
commit a7d70432a4cdc0c963383cd6ac8207251eee6d02
Author: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
Date: Sun Aug 18 21:36:05 2013 +0700
Use a generated filename for an old patch file
The old name is good (generic-im-adjustable-default-state), but
we want a consistent way to provide patch files. Here the number
1001 is used, because we indicates that is on a another branch
commit de46e6b1996d87c6ea1fa0cfe8ca8fb9e4aa3a9b
Author: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
Date: Sun Aug 18 21:24:00 2013 +0700
Split big patch file :uim-vi.patch into chunks
The same reason is provided here
https://github.com/TheSLinux/buildsystem/ \
commit/23779a1068b5a062f3cddf9cad2db82492973e24
-----------------------------------------------------------------------
Summary of changes:
...up-some-non-vi-modules-language-supports.patch} | 200 +--------------------
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 ++++++
...nfig.-to-set-default-mode-for-generic-IM.patch} | 0
...show-candidate-window-via-generic-option.patch} | 34 +---
.../2002-m17nlib-now-requires-generic-custom.patch | 29 +++
uim-vi/PKGBUILD | 21 ++-
9 files changed, 240 insertions(+), 236 deletions(-)
rename uim-vi/{uim-vi.patch =>
0001-Clean-up-some-non-vi-modules-language-supports.patch} (59%)
create mode 100644 uim-vi/0002-Add-new-module-xtelex.patch
create mode 100644 uim-vi/0003-Add-new-module-xvni.patch
create mode 100644 uim-vi/0004-Should-use-.png-instead-of-.svg-for-vni.patch
create mode 100644 uim-vi/0005-IPA-support-xtelex-ipa-xvni-ipa.patch
rename uim-vi/{uim-vi-generic_im_adjustable_default_state.patch =>
1001-config.-to-set-default-mode-for-generic-IM.patch} (100%)
rename uim-vi/{uim-vi-m17n-candidate-window.patch =>
2001-Hide-show-candidate-window-via-generic-option.patch} (56%)
create mode 100644 uim-vi/2002-m17nlib-now-requires-generic-custom.patch
diff --git a/uim-vi/uim-vi.patch
b/uim-vi/0001-Clean-up-some-non-vi-modules-language-supports.patch
similarity index 59%
rename from uim-vi/uim-vi.patch
rename to uim-vi/0001-Clean-up-some-non-vi-modules-language-supports.patch
index ce8f0a0..5d44642 100644
--- a/uim-vi/uim-vi.patch
+++ b/uim-vi/0001-Clean-up-some-non-vi-modules-language-supports.patch
@@ -1,7 +1,7 @@
From 9d045097c5ed5a6d7c651582235b618028117956 Mon Sep 17 00:00:00 2001
From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
Date: Tue, 9 Apr 2013 17:46:51 +0000
-Subject: [PATCH 1/5] Clean up some non-vi modules/language supports
+Subject: [PATCH] Clean up some non-vi modules/language supports
---
uim-vi/src/uim-1.8.5/byeoru-data/Makefile.am | 2 +-
@@ -288,201 +288,5 @@ index 33d95f9..73a5338 100644
NATIVE_TABLES =
--
-1.8.2.1
-
-
-From df04775feb13d9eabe595c34bc6c33ed3c8ae9d1 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
-Date: Thu, 11 Apr 2013 13:43:38 +0000
-Subject: [PATCH 2/5] 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.2.1
-
-
-From 2db90b14131b52f17615d812c3ac3bae6a150a09 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
-Date: Fri, 12 Apr 2013 08:05:41 +0000
-Subject: [PATCH 3/5] 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.2.1
-
-
-From cb0e841a0a3cba64df57eb09dc536277a0c1cc23 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
-Date: Fri, 12 Apr 2013 08:20:32 +0000
-Subject: [PATCH 4/5] 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.2.1
-
-
-From 4623e44eafd196a84966f8bbfe6712811b4e98b9 Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
-Date: Sat, 4 May 2013 10:06:41 +0700
-Subject: [PATCH 5/5] + 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.2.1
+1.8.3
diff --git a/uim-vi/0002-Add-new-module-xtelex.patch
b/uim-vi/0002-Add-new-module-xtelex.patch
new file mode 100644
index 0000000..71a43b7
--- /dev/null
+++ b/uim-vi/0002-Add-new-module-xtelex.patch
@@ -0,0 +1,55 @@
+From df04775feb13d9eabe595c34bc6c33ed3c8ae9d1 Mon Sep 17 00:00:00 2001
+From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
+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
new file mode 100644
index 0000000..7e3c022
--- /dev/null
+++ b/uim-vi/0003-Add-new-module-xvni.patch
@@ -0,0 +1,56 @@
+From 2db90b14131b52f17615d812c3ac3bae6a150a09 Mon Sep 17 00:00:00 2001
+From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
+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
new file mode 100644
index 0000000..ed2e55a
--- /dev/null
+++ b/uim-vi/0004-Should-use-.png-instead-of-.svg-for-vni.patch
@@ -0,0 +1,25 @@
+From cb0e841a0a3cba64df57eb09dc536277a0c1cc23 Mon Sep 17 00:00:00 2001
+From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
+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
new file mode 100644
index 0000000..8e45ee4
--- /dev/null
+++ b/uim-vi/0005-IPA-support-xtelex-ipa-xvni-ipa.patch
@@ -0,0 +1,56 @@
+From 4623e44eafd196a84966f8bbfe6712811b4e98b9 Mon Sep 17 00:00:00 2001
+From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
+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/uim-vi-generic_im_adjustable_default_state.patch
b/uim-vi/1001-config.-to-set-default-mode-for-generic-IM.patch
similarity index 100%
rename from uim-vi/uim-vi-generic_im_adjustable_default_state.patch
rename to uim-vi/1001-config.-to-set-default-mode-for-generic-IM.patch
diff --git a/uim-vi/uim-vi-m17n-candidate-window.patch
b/uim-vi/2001-Hide-show-candidate-window-via-generic-option.patch
similarity index 56%
rename from uim-vi/uim-vi-m17n-candidate-window.patch
rename to uim-vi/2001-Hide-show-candidate-window-via-generic-option.patch
index 013b9fc..cc24030 100644
--- a/uim-vi/uim-vi-m17n-candidate-window.patch
+++ b/uim-vi/2001-Hide-show-candidate-window-via-generic-option.patch
@@ -1,7 +1,7 @@
From fef061382e7ddb9332b3244db260b33b7ff37824 Mon Sep 17 00:00:00 2001
From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
Date: Sat, 27 Apr 2013 03:59:01 +0700
-Subject: [PATCH 1/2] Hide/show candidate window via generic option
+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.
@@ -31,35 +31,5 @@ index 3f413db..7dba894 100644
candidates-changed?
(and
--
-1.8.2.1
-
-
-From 11f77051bf016a9a79bf650ca0ffe1d86df63eaf Mon Sep 17 00:00:00 2001
-From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
-Date: Sat, 4 May 2013 10:52:04 +0700
-Subject: [PATCH 2/2] 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.2.1
+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
new file mode 100644
index 0000000..ce89b36
--- /dev/null
+++ b/uim-vi/2002-m17nlib-now-requires-generic-custom.patch
@@ -0,0 +1,29 @@
+From 11f77051bf016a9a79bf650ca0ffe1d86df63eaf Mon Sep 17 00:00:00 2001
+From: Ky-Anh Huynh <kyanh@xxxxxxxxxxxxx>
+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/PKGBUILD b/uim-vi/PKGBUILD
index dddcb79..09f3b56 100644
--- a/uim-vi/PKGBUILD
+++ b/uim-vi/PKGBUILD
@@ -15,9 +15,15 @@ optdepends=('qt4: immodule and helper applications'
'gtk3: immodules and helper applications')
options=('!libtool')
-source=("uim-vi.patch"
- "uim-vi-m17n-candidate-window.patch"
- "uim-vi-generic_im_adjustable_default_state.patch"
+source=(
+ "0001-Clean-up-some-non-vi-modules-language-supports.patch"
+ "0002-Add-new-module-xtelex.patch"
+ "0003-Add-new-module-xvni.patch"
+ "0004-Should-use-.png-instead-of-.svg-for-vni.patch"
+ "0005-IPA-support-xtelex-ipa-xvni-ipa.patch"
+ "1001-config.-to-set-default-mode-for-generic-IM.patch"
+ "2001-Hide-show-candidate-window-via-generic-option.patch"
+ "2002-m17nlib-now-requires-generic-custom.patch"
"http://uim.googlecode.com/files/uim-${pkgver}.tar.gz";
"https://raw.github.com/TheSLinux-forks/myquartz-scim2uim/v1.1.0/bin/scim2uim.awk";)
@@ -52,9 +58,12 @@ build() {
touch "./pixmaps/${_file}"
done
- patch -Np4 < "${srcdir}/uim-vi.patch"
- patch -Np4 < "${srcdir}/uim-vi-generic_im_adjustable_default_state.patch"
- patch -l -Np4 < "${srcdir}/uim-vi-m17n-candidate-window.patch"
+ for _f_patch in ${srcdir}/000[1-5]*.patch \
+ ${srcdir}/1001-*.patch \
+ ${srcdir}/200[1-2]-*.patch \
+ ; do
+ patch -Np4 < "$_f_patch"
+ done
./autogen.sh
./configure \
hooks/post-receive
--
theslinux-buildsystem
--
Purpose: Store commits, feeds from other projects
Post: mailto:theslinux-phantom@xxxxxxxxxxxxx
Archive, Gmane: http://theslinux.org/lists/phantom/
Subscribe: mailto:theslinux-phantom-request@xxxxxxxxxxxxx?Subject=subscribe
Unsubscribe: mailto:theslinux-phantom-request@xxxxxxxxxxxxx?Subject=unsubscribe
Other information: http://theslinux.org/lists (vi) or
http://theslinux.org/lists/en (en)
Support: mailto:theslinux-questions@xxxxxxxxxxxxx
Other related posts:
- » theslinux-buildsystem branch uim-vi updated 957584a Split big patch file into chunks - git
