rpms/ibus
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated ibus-HEAD.patch for Czech (qwerty) keymap.

Browse Source
This commit is contained in:
Takao Fujiwara 2014-03-28 17:43:21 +09:00
parent 7c758e45c6
commit 0140d313b3
3 changed files with 100 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
ibus-541492-xkb.patch
View File

@ -1,6 +1,6 @@
From 8085ca38cb9c2ea370ebe64d80a4d7894a485960 Mon Sep 17 00:00:00 2001 From bce8b85886075fbdbf28bd5795be8bd41f3a984e Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com> From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 14 Jan 2014 15:27:50 +0900 Date: Thu, 13 Mar 2014 15:49:11 +0900
Subject: [PATCH] Add libgnomekbd and load preload engines. Subject: [PATCH] Add libgnomekbd and load preload engines.
--- ---
@ -20,9 +20,9 @@ Subject: [PATCH] Add libgnomekbd and load preload engines.
ui/gtk3/Makefile.am | 36 ++++ ui/gtk3/Makefile.am | 36 ++++
ui/gtk3/gkbdlayout.vala.false | 63 ++++++ ui/gtk3/gkbdlayout.vala.false | 63 ++++++
ui/gtk3/gkbdlayout.vala.true | 108 ++++++++++ ui/gtk3/gkbdlayout.vala.true | 108 ++++++++++
ui/gtk3/panel.vala | 196 ++++++++++++++++- ui/gtk3/panel.vala | 230 +++++++++++++++++++-
ui/gtk3/xkblayout.vala | 429 ++++++++++++++++++++++++++++++++++++ ui/gtk3/xkblayout.vala | 429 ++++++++++++++++++++++++++++++++++++
18 files changed, 1634 insertions(+), 5 deletions(-) 18 files changed, 1668 insertions(+), 5 deletions(-)
create mode 100644 bindings/vala/Gkbd-3.0.metadata create mode 100644 bindings/vala/Gkbd-3.0.metadata
create mode 100644 bindings/vala/Xkl-1.0.metadata create mode 100644 bindings/vala/Xkl-1.0.metadata
create mode 100644 bindings/vala/gkbd.deps create mode 100644 bindings/vala/gkbd.deps
@ -130,7 +130,7 @@ index eec6da3..f84c034 100644
continue; continue;
g_variant_builder_add ( g_variant_builder_add (
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index d71c415..779e29e 100644 index 9a502ec..3ec629d 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -261,6 +261,45 @@ else @@ -261,6 +261,45 @@ else
@ -188,7 +188,7 @@ index d71c415..779e29e 100644
]) ])
diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index d256cbb..8fd7e15 100644 index 2f76ce3..caec315 100644
--- a/data/ibus.schemas.in --- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in +++ b/data/ibus.schemas.in
@@ -56,6 +56,52 @@ @@ -56,6 +56,52 @@
@ -1012,7 +1012,7 @@ index 0000000..5aa486d
+G_END_DECLS +G_END_DECLS
+#endif +#endif
diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am
index 6012cfa..3dfa0df 100644 index b2fb800..f148202 100644
--- a/ui/gtk3/Makefile.am --- a/ui/gtk3/Makefile.am
+++ b/ui/gtk3/Makefile.am +++ b/ui/gtk3/Makefile.am
@@ -35,6 +35,8 @@ gtkpanel.xml: gtkpanel.xml.in @@ -35,6 +35,8 @@ gtkpanel.xml: gtkpanel.xml.in
@ -1279,7 +1279,7 @@ index 0000000..a6e0f8d
+ */ + */
+} +}
diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index a7a0c40..1da7966 100644 index 748cb32..7a15049 100644
--- a/ui/gtk3/panel.vala --- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala +++ b/ui/gtk3/panel.vala
@@ -63,6 +63,13 @@ class Panel : IBus.PanelService { @@ -63,6 +63,13 @@ class Panel : IBus.PanelService {
@ -1513,6 +1513,54 @@ index a7a0c40..1da7966 100644
engine_contexts_insert(engine); engine_contexts_insert(engine);
} }
@@ -636,6 +830,39 @@ class Panel : IBus.PanelService {
}
}
+ /* IBus.Bus.get_engines_by_names() returns 'us' engine if the name
+ * does not exist in simple.xml and 'us' engine could be duplicated.
+ */
+ private IBus.EngineDesc[] uniq_engines(IBus.EngineDesc[] engines) {
+ if (engines.length == 0)
+ return engines;
+
+ int i = 0;
+ IBus.EngineDesc[] retval = {};
+
+ for (; i < engines.length; i++) {
+ if (engines[i].get_name() == "xkb:us::eng")
+ break;
+ }
+
+ if (i == engines.length)
+ return engines;
+
+ for (int j = 0; j < engines.length; j++) {
+ if (j <= i) {
+ retval += engines[j];
+ continue;
+ }
+
+ if (engines[i].get_name() == engines[j].get_name())
+ continue;
+
+ retval += engines[j];
+ }
+
+ return retval;
+ }
+
private void run_preload_engines(IBus.EngineDesc[] engines, int index) {
string[] names = {};
@@ -668,6 +895,7 @@ class Panel : IBus.PanelService {
}
var engines = m_bus.get_engines_by_names(names);
+ engines = uniq_engines(engines);
if (m_engines.length == 0) {
m_engines = engines;
diff --git a/ui/gtk3/xkblayout.vala b/ui/gtk3/xkblayout.vala diff --git a/ui/gtk3/xkblayout.vala b/ui/gtk3/xkblayout.vala
new file mode 100644 new file mode 100644
index 0000000..b7dfb3e index 0000000..b7dfb3e
@ -1949,5 +1997,5 @@ index 0000000..b7dfb3e
+ */ + */
+} +}
-- --
1.8.0 1.8.5.3

37
ibus-HEAD.patch
View File

@ -1 +1,38 @@
From 9782a20c544001a211a788975f55ded5064b7273 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 18 Mar 2014 11:41:33 +0900
Subject: [PATCH] Add Czech (qwerty) keymap.
BUG=rhbz#1074879
Review URL: https://codereview.appspot.com/74520044
---
engine/simple.xml.in | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/engine/simple.xml.in b/engine/simple.xml.in
index 4218f6c..b3ac6a5 100644
--- a/engine/simple.xml.in
+++ b/engine/simple.xml.in
@@ -203,6 +203,18 @@
<icon>ibus-keyboard</icon>
<rank>99</rank>
</engine>
+ <engine>
+ <name>xkb:cz:qwerty:cze</name>
+ <language>cze</language>
+ <license>GPL</license>
+ <author>Peng Huang &lt;shawn.p.huang@gmail.com&gt;</author>
+ <layout>cz</layout>
+ <layout_variant>qwerty</layout_variant>
+ <longname>Czech (qwerty)</longname>
+ <description>Czech (qwerty)</description>
+ <icon>ibus-keyboard</icon>
+ <rank>99</rank>
+ </engine>
<engine>
<name>xkb:dk::dan</name>
<language>dan</language>
--
1.8.5.3

7
ibus.spec
View File

@ -36,7 +36,7 @@
Name: ibus Name: ibus
Version: 1.5.6 Version: 1.5.6
Release: 1%{?dist} Release: 2%{?dist}
Summary: Intelligent Input Bus for Linux OS Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -49,6 +49,7 @@ Source2: %{name}.conf.5
Source3: https://github.com/ibus/ibus-xkb/archive/ibus-xkb-%{ibus_xkb_version}.tar.gz Source3: https://github.com/ibus/ibus-xkb/archive/ibus-xkb-%{ibus_xkb_version}.tar.gz
# Upstreamed patches. # Upstreamed patches.
# Patch0: %%{name}-HEAD.patch # Patch0: %%{name}-HEAD.patch
Patch0: %{name}-HEAD.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=810211 # https://bugzilla.redhat.com/show_bug.cgi?id=810211
Patch1: %{name}-810211-no-switch-by-no-trigger.patch Patch1: %{name}-810211-no-switch-by-no-trigger.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=541492 # https://bugzilla.redhat.com/show_bug.cgi?id=541492
@ -250,6 +251,7 @@ The ibus-devel-docs package contains developer documentation for ibus
%prep %prep
%setup -q %setup -q
# %%patch0 -p1 # %%patch0 -p1
%patch0 -p1
%if (0%{?fedora} < 20 && 0%{?rhel} < 8) %if (0%{?fedora} < 20 && 0%{?rhel} < 8)
%patch96 -p1 -b .passwd %patch96 -p1 -b .passwd
%endif %endif
@ -463,6 +465,9 @@ fi
%{_datadir}/gtk-doc/html/* %{_datadir}/gtk-doc/html/*
%changelog %changelog
* Fri Mar 28 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.6-2
- Updated ibus-HEAD.patch for Czech (qwerty) keymap.
* Thu Mar 06 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.6-1 * Thu Mar 06 2014 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.6-1
- Bumped to 1.5.6 - Bumped to 1.5.6
- Deleted ibus-xx-ctrl-space.patch - Deleted ibus-xx-ctrl-space.patch