This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from d04bacf debian/changelog: fixup. new cd6a3f9 don't exit when setting command line arguments -xkb-model, -xkb-layout, -xkb-variant on Xorg < 11899001. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2gokdriveinit.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit cd6a3f9b1a2ba9817df6fc9230c8a07d13cff40a Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Mon Mar 27 10:13:53 2023 -0600 don't exit when setting command line arguments -xkb-model, -xkb-layout, -xkb-variant on Xorg < 11899001. --- debian/changelog | 2 ++ x2gokdriveinit.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/debian/changelog b/debian/changelog index f3b9416..0c54f15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,8 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium - make screen repaint faster. - add command line option for initial JPEG quality. - fix building on Xorg < 11900000. + - don't exit when setting command line arguments -xkb-model, -xkb-layout, + -xkb-variant on Xorg < 11899001. [ Mihai Moldovan ] * Initial release: diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index a47241a..50f6a69 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -246,6 +246,42 @@ ddxProcessArgument(int argc, char **argv, int i) UseMsg(); exit(1); } +#if XORG_VERSION_CURRENT < 11899001 +/* + * older versions didn't support this command line arguments. Maybe better to patch it with: + * https://github.com/freedesktop/xorg-xserver/commit/40e32e9fc9f3a1bd8287ee03d... +*/ + else if (!strcmp(argv[i], "-xkb-model")) + { + if ((i + 1) < argc) + { + return 2; + } + + UseMsg(); + exit(1); + } + else if (!strcmp(argv[i], "-xkb-layout")) + { + if ((i + 1) < argc) + { + return 2; + } + + UseMsg(); + exit(1); + } + else if (!strcmp(argv[i], "-xkb-variant")) + { + if ((i + 1) < argc) + { + return 2; + } + + UseMsg(); + exit(1); + } +#endif /* XORG_VERSION_CURRENT */ else if (!strcmp(argv[i], "-quality")) { if ((i + 1) < argc) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org