diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/libxklavier/libxklavier')
2 files changed, 75 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier/0001-xklavier_config_xkb.c-Fix-keyboard-layout-settings-f.patch b/meta-gnome/recipes-gnome/libxklavier/libxklavier/0001-xklavier_config_xkb.c-Fix-keyboard-layout-settings-f.patch new file mode 100644 index 0000000000..6c2d091123 --- /dev/null +++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier/0001-xklavier_config_xkb.c-Fix-keyboard-layout-settings-f.patch @@ -0,0 +1,39 @@ +From 1a75ebdde705ab2a4f9459a60ab824d9f770bba4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Wed, 28 Nov 2018 18:03:31 +0100 +Subject: [PATCH] xklavier_config_xkb.c: Fix keyboard layout settings for xfce +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* Got helping hint at [1] +* Patch stolen from [2] + +[1] https://bugzilla.xfce.org/show_bug.cgi?id=14185 +[2] https://launchpadlibrarian.net/399410035/revert-default-group-change.patch + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + libxklavier/xklavier_config_xkb.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c +index baec569..c823e5b 100644 +--- a/libxklavier/xklavier_config_xkb.c ++++ b/libxklavier/xklavier_config_xkb.c +@@ -403,10 +403,6 @@ xkl_config_get_keyboard(XklEngine * engine, + /* Return to normal X error processing */ + xkl_engine_priv(engine, critical_section) = FALSE; + +- if (activate) +- xkl_config_set_group_by_description(engine, +- preactivation_group_description); +- + xkl_debug(160, + "Unlinking the temporary xkb file %s\n", + xkb_fn); +-- +2.14.5 + diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch b/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch new file mode 100644 index 0000000000..29eeef3d50 --- /dev/null +++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch @@ -0,0 +1,36 @@ +From 2343283caf88d2390afee08fe034b4c970b20f2e Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sat, 16 Apr 2016 06:40:04 -0400 +Subject: [PATCH] fix do_installe failure + +| 18 /usr/bin/install -c -m 644 ../../libxklavier-5.4/libxklavier/libxklavier.vapi +libxklavier.deps 'tmp/work/corei7-64-wrs-linux/libxklavier/5.4-r0/image/ +usr/share/vala/vapi' +| 19 /usr/bin/install: cannot stat '../../libxklavier-5.4/libxklavier/ +libxklavier.vapi': No such file or directory +| 20 Makefile:621: recipe for target 'install-vapiDATA' failed +| 21 make[3]: *** [install-vapiDATA] Error 1 +| 22 make[3]: *** Waiting for unfinished jobs.... + +Upstream-Stauts: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + libxklavier/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libxklavier/Makefile.am b/libxklavier/Makefile.am +index c9c1bbe..f0efa32 100644 +--- a/libxklavier/Makefile.am ++++ b/libxklavier/Makefile.am +@@ -131,6 +131,6 @@ libxklavier.deps: + done + + vapidir = $(datadir)/vala/vapi +-vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps) ++vapi_DATA = $(VAPIGEN_VAPIS:.vapi=.deps) + endif + endif +-- +1.9.1 + |