diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2018-11-29 02:53:33 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-11-29 18:44:56 -0800 |
commit | 97055da2c6a13d5a2b891340e8eb4db8035c41cd (patch) | |
tree | 19dd7ced6cf9252ba339d75fc7cbdbf375ff0f14 /meta-gnome | |
parent | e23284f9a57537f7dcaca4cd068f3862e205188a (diff) | |
download | meta-openembedded-97055da2c6a13d5a2b891340e8eb4db8035c41cd.tar.gz |
libxklavier: Fix keyboard layout bug for xfce4-settings
* This was one the longest lasting and most annoying bug
* While we are at it: rename path files -> libxklavier
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/libxklavier/libxklavier/0001-xklavier_config_xkb.c-Fix-keyboard-layout-settings-f.patch | 39 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch (renamed from meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch) | 0 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb | 1 |
3 files changed, 40 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 000000000..6c2d09112 --- /dev/null +++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier/0001-xklavier_config_xkb.c-Fix-keyboard-layout-settings-f.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 1a75ebdde705ab2a4f9459a60ab824d9f770bba4 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Wed, 28 Nov 2018 18:03:31 +0100 | ||
4 | Subject: [PATCH] xklavier_config_xkb.c: Fix keyboard layout settings for xfce | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | * Got helping hint at [1] | ||
10 | * Patch stolen from [2] | ||
11 | |||
12 | [1] https://bugzilla.xfce.org/show_bug.cgi?id=14185 | ||
13 | [2] https://launchpadlibrarian.net/399410035/revert-default-group-change.patch | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
18 | --- | ||
19 | libxklavier/xklavier_config_xkb.c | 4 ---- | ||
20 | 1 file changed, 4 deletions(-) | ||
21 | |||
22 | diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c | ||
23 | index baec569..c823e5b 100644 | ||
24 | --- a/libxklavier/xklavier_config_xkb.c | ||
25 | +++ b/libxklavier/xklavier_config_xkb.c | ||
26 | @@ -403,10 +403,6 @@ xkl_config_get_keyboard(XklEngine * engine, | ||
27 | /* Return to normal X error processing */ | ||
28 | xkl_engine_priv(engine, critical_section) = FALSE; | ||
29 | |||
30 | - if (activate) | ||
31 | - xkl_config_set_group_by_description(engine, | ||
32 | - preactivation_group_description); | ||
33 | - | ||
34 | xkl_debug(160, | ||
35 | "Unlinking the temporary xkb file %s\n", | ||
36 | xkb_fn); | ||
37 | -- | ||
38 | 2.14.5 | ||
39 | |||
diff --git a/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch b/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch index 29eeef3d5..29eeef3d5 100644 --- a/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch +++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch | |||
diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb index 2ef54f212..501a44972 100644 --- a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb +++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb | |||
@@ -13,6 +13,7 @@ RDEPENDS_${PN} += "iso-codes xkbcomp" | |||
13 | SRC_URI = " \ | 13 | SRC_URI = " \ |
14 | http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-${PV}.tar.bz2/13af74dcb6011ecedf1e3ed122bd31fa/${BPN}-${PV}.tar.bz2 \ | 14 | http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-${PV}.tar.bz2/13af74dcb6011ecedf1e3ed122bd31fa/${BPN}-${PV}.tar.bz2 \ |
15 | file://fix-do_installe-failure.patch \ | 15 | file://fix-do_installe-failure.patch \ |
16 | file://0001-xklavier_config_xkb.c-Fix-keyboard-layout-settings-f.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI[md5sum] = "13af74dcb6011ecedf1e3ed122bd31fa" | 18 | SRC_URI[md5sum] = "13af74dcb6011ecedf1e3ed122bd31fa" |
18 | SRC_URI[sha256sum] = "17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320" | 19 | SRC_URI[sha256sum] = "17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320" |