From 065088f971a35db3472f5b5a477fcb024f839eee Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 28 Dec 2018 16:17:10 +0100 Subject: libxklavier: Fix keyboard layout bug for xfce4-settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * This was one the longest lasting and most annoying bug * While we are at it: rename path files -> libxklavier (From master: 97055da2) Signed-off-by: Andreas Müller Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- .../files/fix-do_installe-failure.patch | 36 -------------------- ...nfig_xkb.c-Fix-keyboard-layout-settings-f.patch | 39 ++++++++++++++++++++++ .../libxklavier/fix-do_installe-failure.patch | 36 ++++++++++++++++++++ .../recipes-gnome/libxklavier/libxklavier_5.4.bb | 1 + 4 files changed, 76 insertions(+), 36 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch create mode 100644 meta-gnome/recipes-gnome/libxklavier/libxklavier/0001-xklavier_config_xkb.c-Fix-keyboard-layout-settings-f.patch create mode 100644 meta-gnome/recipes-gnome/libxklavier/libxklavier/fix-do_installe-failure.patch diff --git a/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch b/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch deleted file mode 100644 index 29eeef3d50..0000000000 --- a/meta-gnome/recipes-gnome/libxklavier/files/fix-do_installe-failure.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2343283caf88d2390afee08fe034b4c970b20f2e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -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 ---- - 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 - 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?= +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 +--- + 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 +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 +--- + 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 + diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb index 2ef54f212f..501a449725 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" SRC_URI = " \ http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BPN}-${PV}.tar.bz2/13af74dcb6011ecedf1e3ed122bd31fa/${BPN}-${PV}.tar.bz2 \ file://fix-do_installe-failure.patch \ + file://0001-xklavier_config_xkb.c-Fix-keyboard-layout-settings-f.patch \ " SRC_URI[md5sum] = "13af74dcb6011ecedf1e3ed122bd31fa" SRC_URI[sha256sum] = "17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320" -- cgit 1.2.3-korg