From 5e1d977491007ac2b97d9de976df8eab2853d953 Mon Sep 17 00:00:00 2001
From: Olga Ustuzhanina <me@laserbat.pw>
Date: Thu, 24 Jan 2019 15:06:22 +0700
Subject: [PATCH] jwm: fix desktop switching on dvorak layouts

---
 srcpkgs/jwm/patches/fix_dvorak.patch | 22 ++++++++++++++++++++++
 srcpkgs/jwm/template                 |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/jwm/patches/fix_dvorak.patch

diff --git a/srcpkgs/jwm/patches/fix_dvorak.patch b/srcpkgs/jwm/patches/fix_dvorak.patch
new file mode 100644
index 00000000000..fa9816f8b7c
--- /dev/null
+++ b/srcpkgs/jwm/patches/fix_dvorak.patch
@@ -0,0 +1,22 @@
+diff --git src/key.c src/key.c
+index 4b00d26..caefe42 100644
+--- src/key.c
++++ src/key.c
+@@ -18,6 +18,8 @@
+ #include "root.h"
+ #include "tray.h"
+ 
++#include <X11/XKBlib.h>
++
+ #define MASK_NONE    0
+ #define MASK_SHIFT   (1 << ShiftMapIndex)
+ #define MASK_LOCK    (1 << LockMapIndex)
+@@ -396,7 +398,7 @@ void InsertBinding(KeyType key, const char *modifiers,
+ 
+             for(temp[offset] = '1'; temp[offset] <= '9'; temp[offset]++) {
+ 
+-               sym = ParseKeyString(temp);
++               sym = XkbKeycodeToKeysym(display, temp[offset] - '1' + 10, 0, 0);
+                if(sym == NoSymbol) {
+                   Release(temp);
+                   return;
diff --git a/srcpkgs/jwm/template b/srcpkgs/jwm/template
index 21294b933c6..a6963ade6a6 100644
--- a/srcpkgs/jwm/template
+++ b/srcpkgs/jwm/template
@@ -1,7 +1,7 @@
 # Template file for 'jwm'
 pkgname=jwm
 version=2.3.7
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="