* [PATCH] ui: update keycodemapdb submodule commit
@ 2021-07-05 7:59 Akihiko Odaki
0 siblings, 0 replies; 5+ messages in thread
From: Akihiko Odaki @ 2021-07-05 7:59 UTC (permalink / raw)
Cc: Daniel P . Berrangé, qemu-devel, Akihiko Odaki, Gerd Hoffmann
The change of ui/keycodemapdb effective on QEMU is only commit
d21009b1c9f94b740ea66be8e48a1d8ad8124023, which adds mappings for key
codes added in commit d7696ff884e35c6dacf83a7cbe3355e3b0a90125.
d21009b1c9f94b740ea66be8e48a1d8ad8124023 Add QEMU QKeyCode "lang1" and "lang2"
320f92c36a80bfafc5d57834592a7be5fd79f104 rust: fix cargo clippy
e62d42f0fd76f7bb8bf78385a83c060e66ff52b0 tests: add rust test
3e25e1ca1772fc3f2039f739f8f920450dc68e50 gen: add --lang rust
9133a0b8022d1fb063a81cc2ba3b627c14ccdfd1 tests: fix argument order
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
---
ui/keycodemapdb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/keycodemapdb b/ui/keycodemapdb
index 6119e6e19a0..d21009b1c9f 160000
--- a/ui/keycodemapdb
+++ b/ui/keycodemapdb
@@ -1 +1 @@
-Subproject commit 6119e6e19a050df847418de7babe5166779955e4
+Subproject commit d21009b1c9f94b740ea66be8e48a1d8ad8124023
--
2.30.1 (Apple Git-130)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] ui: update keycodemapdb submodule commit
2021-01-27 18:08 Daniel P. Berrangé
@ 2021-01-27 18:53 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-01-27 18:53 UTC (permalink / raw)
To: Daniel P. Berrangé, qemu-devel; +Cc: Gerd Hoffmann
On 1/27/21 7:08 PM, Daniel P. Berrangé wrote:
> Primarily this is to pull in a fix for Win32 keycodes. The other useful
> change is the removal of build timestamp from generated files which is
> desirable for reproducable builds.
>
> The make rules need updating due to slightly changed CLI syntax - more
> args must now come after the command name.
>
> 6119e6e19a050df847418de7babe5166779955e4 Fix scan codes for Korean keys
> 685684a8404301780714e8a89a871981e7cae988 Fix argument order in output headers
> b3774853042c951b200d767697285781cc59a83c Add HTML entries for Korean layout keys
> 8e54850d800e4697a2798fb82ac740e760f8530b Add macOS entries for Japanese keyboards
> 27acf0ef828bf719b2053ba398b195829413dbdd Fix win32 keycode for VK_OEM_102
> 317d3eeb963a515e15a63fa356d8ebcda7041a51 Add support for generating RST formatted docs pages
> 7381b9bfadd31c4c9e9a10b5bb5032f9189d4352 Introduce separate args for title & subtitle with docs generator
> 6280c94f306df6a20bbc100ba15a5a81af0366e6 keymap-gen: Name sections in pod output
> df4e56f8fab65ba714ec18f4e7338a966a1620ad Add an empty meson project
> 16e5b0787687d8904dad2c026107409eb9bfcb95 remove buildtime from generated files
> 044f21dd0d4f62519aae9f1d53a026407a0b664f add header file generators
> 7779876a6b06755e3bb2c94ee3ded50635bcb0fa c++: add extern declaration to the generated file
> 0e0a317889464397d6f1ae03aad0d2ca593aab04 move CLanguageGenerator closer to CLanguageGenerator itself
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
> ui/keycodemapdb | 2 +-
> ui/meson.build | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/ui/keycodemapdb b/ui/keycodemapdb
> index 6b3d716e2b..6119e6e19a 160000
> --- a/ui/keycodemapdb
> +++ b/ui/keycodemapdb
> @@ -1 +1 @@
> -Subproject commit 6b3d716e2b6472eb7189d3220552280ef3d832ce
> +Subproject commit 6119e6e19a050df847418de7babe5166779955e4
> diff --git a/ui/meson.build b/ui/meson.build
> index 634fabab0d..156b600a99 100644
> --- a/ui/meson.build
> +++ b/ui/meson.build
> @@ -127,9 +127,10 @@ if have_system or xkbcommon.found()
> capture: true,
> input: files('keycodemapdb/data/keymaps.csv'),
> command: [python.full_path(), files('keycodemapdb/tools/keymap-gen'),
> + 'code-map',
> '--lang', 'glib2',
> '--varname', 'qemu_input_map_@0@_to_@1@'.format(e[0], e[1]),
> - 'code-map', '@INPUT0@', e[0], e[1]])
> + '@INPUT0@', e[0], e[1]])
This matches with 685684a ("Fix argument order in output headers") indeed.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ui: update keycodemapdb submodule commit
@ 2021-01-27 18:08 Daniel P. Berrangé
2021-01-27 18:53 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 5+ messages in thread
From: Daniel P. Berrangé @ 2021-01-27 18:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P. Berrangé, Gerd Hoffmann
Primarily this is to pull in a fix for Win32 keycodes. The other useful
change is the removal of build timestamp from generated files which is
desirable for reproducable builds.
The make rules need updating due to slightly changed CLI syntax - more
args must now come after the command name.
6119e6e19a050df847418de7babe5166779955e4 Fix scan codes for Korean keys
685684a8404301780714e8a89a871981e7cae988 Fix argument order in output headers
b3774853042c951b200d767697285781cc59a83c Add HTML entries for Korean layout keys
8e54850d800e4697a2798fb82ac740e760f8530b Add macOS entries for Japanese keyboards
27acf0ef828bf719b2053ba398b195829413dbdd Fix win32 keycode for VK_OEM_102
317d3eeb963a515e15a63fa356d8ebcda7041a51 Add support for generating RST formatted docs pages
7381b9bfadd31c4c9e9a10b5bb5032f9189d4352 Introduce separate args for title & subtitle with docs generator
6280c94f306df6a20bbc100ba15a5a81af0366e6 keymap-gen: Name sections in pod output
df4e56f8fab65ba714ec18f4e7338a966a1620ad Add an empty meson project
16e5b0787687d8904dad2c026107409eb9bfcb95 remove buildtime from generated files
044f21dd0d4f62519aae9f1d53a026407a0b664f add header file generators
7779876a6b06755e3bb2c94ee3ded50635bcb0fa c++: add extern declaration to the generated file
0e0a317889464397d6f1ae03aad0d2ca593aab04 move CLanguageGenerator closer to CLanguageGenerator itself
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
ui/keycodemapdb | 2 +-
ui/meson.build | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ui/keycodemapdb b/ui/keycodemapdb
index 6b3d716e2b..6119e6e19a 160000
--- a/ui/keycodemapdb
+++ b/ui/keycodemapdb
@@ -1 +1 @@
-Subproject commit 6b3d716e2b6472eb7189d3220552280ef3d832ce
+Subproject commit 6119e6e19a050df847418de7babe5166779955e4
diff --git a/ui/meson.build b/ui/meson.build
index 634fabab0d..156b600a99 100644
--- a/ui/meson.build
+++ b/ui/meson.build
@@ -127,9 +127,10 @@ if have_system or xkbcommon.found()
capture: true,
input: files('keycodemapdb/data/keymaps.csv'),
command: [python.full_path(), files('keycodemapdb/tools/keymap-gen'),
+ 'code-map',
'--lang', 'glib2',
'--varname', 'qemu_input_map_@0@_to_@1@'.format(e[0], e[1]),
- 'code-map', '@INPUT0@', e[0], e[1]])
+ '@INPUT0@', e[0], e[1]])
endforeach
endif
--
2.29.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] ui: update keycodemapdb submodule commit
2020-05-05 12:57 Daniel P. Berrangé
@ 2020-05-11 12:32 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-11 12:32 UTC (permalink / raw)
To: Daniel P. Berrangé, qemu-devel; +Cc: Volker Rümelin
+Volker
On 5/5/20 2:57 PM, Daniel P. Berrangé wrote:
> Primarily this is to pull in a fix for Win32 keycodes. The other useful
> change is the removal of build timestamp from generated files which is
> desirable for reproducable builds.
>
> The make rules need updating due to slightly changed CLI syntax - more
> args must now come after the command name.
>
> 27acf0ef828bf719b2053ba398b195829413dbdd Fix win32 keycode for VK_OEM_102
> 317d3eeb963a515e15a63fa356d8ebcda7041a51 Add support for generating RST formatted docs pages
> 7381b9bfadd31c4c9e9a10b5bb5032f9189d4352 Introduce separate args for title & subtitle with docs generator
> 6280c94f306df6a20bbc100ba15a5a81af0366e6 keymap-gen: Name sections in pod output
> df4e56f8fab65ba714ec18f4e7338a966a1620ad Add an empty meson project
> 16e5b0787687d8904dad2c026107409eb9bfcb95 remove buildtime from generated files
> 044f21dd0d4f62519aae9f1d53a026407a0b664f add header file generators
> 7779876a6b06755e3bb2c94ee3ded50635bcb0fa c++: add extern declaration to the generated file
> 0e0a317889464397d6f1ae03aad0d2ca593aab04 move CLanguageGenerator closer to CLanguageGenerator itself
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
> Makefile | 4 ++--
> ui/keycodemapdb | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 34275f57c9..5f2b63b1cd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -310,10 +310,10 @@ ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Makefile
> $(call quiet-command,\
> stem=$* && src=$${stem%-to-*} dst=$${stem#*-to-} && \
> test -e $(KEYCODEMAP_GEN) && \
> - $(PYTHON) $(KEYCODEMAP_GEN) \
> + $(PYTHON) $(KEYCODEMAP_GEN) code-map \
> --lang glib2 \
> --varname qemu_input_map_$${src}_to_$${dst} \
> - code-map $(KEYCODEMAP_CSV) $${src} $${dst} \
> + $(KEYCODEMAP_CSV) $${src} $${dst} \
> > $@ || rm -f $@, "GEN", "$@")
>
> $(KEYCODEMAP_GEN): .git-submodule-status
> diff --git a/ui/keycodemapdb b/ui/keycodemapdb
> index 6b3d716e2b..27acf0ef82 160000
> --- a/ui/keycodemapdb
> +++ b/ui/keycodemapdb
> @@ -1 +1 @@
> -Subproject commit 6b3d716e2b6472eb7189d3220552280ef3d832ce
> +Subproject commit 27acf0ef828bf719b2053ba398b195829413dbdd
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ui: update keycodemapdb submodule commit
@ 2020-05-05 12:57 Daniel P. Berrangé
2020-05-11 12:32 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 5+ messages in thread
From: Daniel P. Berrangé @ 2020-05-05 12:57 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P. Berrangé
Primarily this is to pull in a fix for Win32 keycodes. The other useful
change is the removal of build timestamp from generated files which is
desirable for reproducable builds.
The make rules need updating due to slightly changed CLI syntax - more
args must now come after the command name.
27acf0ef828bf719b2053ba398b195829413dbdd Fix win32 keycode for VK_OEM_102
317d3eeb963a515e15a63fa356d8ebcda7041a51 Add support for generating RST formatted docs pages
7381b9bfadd31c4c9e9a10b5bb5032f9189d4352 Introduce separate args for title & subtitle with docs generator
6280c94f306df6a20bbc100ba15a5a81af0366e6 keymap-gen: Name sections in pod output
df4e56f8fab65ba714ec18f4e7338a966a1620ad Add an empty meson project
16e5b0787687d8904dad2c026107409eb9bfcb95 remove buildtime from generated files
044f21dd0d4f62519aae9f1d53a026407a0b664f add header file generators
7779876a6b06755e3bb2c94ee3ded50635bcb0fa c++: add extern declaration to the generated file
0e0a317889464397d6f1ae03aad0d2ca593aab04 move CLanguageGenerator closer to CLanguageGenerator itself
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
Makefile | 4 ++--
ui/keycodemapdb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 34275f57c9..5f2b63b1cd 100644
--- a/Makefile
+++ b/Makefile
@@ -310,10 +310,10 @@ ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Makefile
$(call quiet-command,\
stem=$* && src=$${stem%-to-*} dst=$${stem#*-to-} && \
test -e $(KEYCODEMAP_GEN) && \
- $(PYTHON) $(KEYCODEMAP_GEN) \
+ $(PYTHON) $(KEYCODEMAP_GEN) code-map \
--lang glib2 \
--varname qemu_input_map_$${src}_to_$${dst} \
- code-map $(KEYCODEMAP_CSV) $${src} $${dst} \
+ $(KEYCODEMAP_CSV) $${src} $${dst} \
> $@ || rm -f $@, "GEN", "$@")
$(KEYCODEMAP_GEN): .git-submodule-status
diff --git a/ui/keycodemapdb b/ui/keycodemapdb
index 6b3d716e2b..27acf0ef82 160000
--- a/ui/keycodemapdb
+++ b/ui/keycodemapdb
@@ -1 +1 @@
-Subproject commit 6b3d716e2b6472eb7189d3220552280ef3d832ce
+Subproject commit 27acf0ef828bf719b2053ba398b195829413dbdd
--
2.26.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-05 8:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-05 7:59 [PATCH] ui: update keycodemapdb submodule commit Akihiko Odaki
-- strict thread matches above, loose matches on Subject: below --
2021-01-27 18:08 Daniel P. Berrangé
2021-01-27 18:53 ` Philippe Mathieu-Daudé
2020-05-05 12:57 Daniel P. Berrangé
2020-05-11 12:32 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.