From 795318c8fad0288d86bd6a392c0f82be60d4b9da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Mon, 23 Jan 2023 11:38:43 +0400
Subject: [PATCH] meson: fix keymap-gen exec on msys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
meson wraps python scripts already on win32:
"C:/msys64/mingw64/bin/meson" "--internal" "exe" "--capture" "src/vncdisplaykeymap_xorgevdev2xtkbd.h" "--" "C:/msys64/mingw64/bin/python.exe" "python" "C:/msys64/home/marca/src/spice-gtk/subprojects/keycodemapdb/tools/keymap-gen" "code-m
ap" "--lang" "glib2" "--varname" "keymap_xorgevdev2xtkbd" "../subprojects/keycodemapdb/data/keymaps.csv" "xorgevdev" "xtkbd"
--- stderr ---
C:/msys64/mingw64/bin/python.exe: can't open file 'C:\\msys64\\home\\marca\\src\\spice-gtk\\build\\python': [Errno 2] No such file or directory
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
src/meson.build | 3 +--
subprojects/keycodemapdb | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index 25d379a8..9811c65e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -300,7 +300,6 @@ if spice_gtk_has_gtk
endif
# keymaps
- python = import('python').find_installation()
keymaps = ['xorgevdev',
'xorgkbd',
'xorgxquartz',
@@ -312,7 +311,7 @@ if spice_gtk_has_gtk
foreach keymap : keymaps
varname = 'keymap_@0@2xtkbd'.format(keymap)
target = 'vncdisplay@0@.h'.format(varname)
- cmd = [python, keymapgen, 'code-map', '--lang', 'glib2', '--varname', varname, keymapcsv, keymap, 'xtkbd']
+ cmd = [keymapgen, 'code-map', '--lang', 'glib2', '--varname', varname, keymapcsv, keymap, 'xtkbd']
spice_client_gtk_sources += custom_target(target,
output : target,
capture : true,
diff --git a/subprojects/keycodemapdb b/subprojects/keycodemapdb
index e15649b8..14cdba29 160000
--- a/subprojects/keycodemapdb
+++ b/subprojects/keycodemapdb
@@ -1 +1 @@
-Subproject commit e15649b83a78f89f57205927022115536d2c1698
+Subproject commit 14cdba29ecd7448310fe4ff890e67830b1a40f64
--
GitLab