[PR PATCH] jwm: remove faulty fix_dvorak.patch

[PR PATCH] jwm: remove faulty fix_dvorak.patch

[tibequadorian]

[-- Attachment #1: Type: text/plain, Size: 1438 bytes --]

There is a new pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages jwm
https://github.com/void-linux/void-packages/pull/36051

jwm: remove faulty fix_dvorak.patch
@paper42 sorry that I noticed this late.
The segfault mentioned in the already closed #35962 was caused by the fix-dvorak.patch.
It's from https://github.com/joewing/jwm/pull/481 and still not upstreamed.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36051.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jwm-36051.patch --]
[-- Type: text/x-diff, Size: 2045 bytes --]

From 9d7f7cf19dd6cda6d00e5f52c6a73f0298914d53 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 23:06:26 +0100
Subject: [PATCH] jwm: remove faulty fix_dvorak.patch

was causing segfault when running `jwm -p`.
---
 srcpkgs/jwm/patches/fix_dvorak.patch | 31 ----------------------------
 srcpkgs/jwm/template                 |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 srcpkgs/jwm/patches/fix_dvorak.patch

diff --git a/srcpkgs/jwm/patches/fix_dvorak.patch b/srcpkgs/jwm/patches/fix_dvorak.patch
deleted file mode 100644
index a8c1a02a9c5b..000000000000
--- a/srcpkgs/jwm/patches/fix_dvorak.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1aa74e96e32b4012ee0e13ada22b64811b519bab Mon Sep 17 00:00:00 2001
-From: Olga Ustuzhanina <me@laserbat.pw>
-Date: Thu, 24 Jan 2019 15:07:31 +0700
-Subject: [PATCH] fix desktop switching on dvorak layouts
-
----
- src/binding.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/binding.c b/src/binding.c
-index dc23b640..8c238717 100644
---- a/src/binding.c
-+++ b/src/binding.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)
-@@ -418,7 +420,7 @@ void InsertBinding(ActionType action, 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 3d052853912c..6595c27e2d6a 100644
--- a/srcpkgs/jwm/template
+++ b/srcpkgs/jwm/template
@@ -1,7 +1,7 @@
 # Template file for 'jwm'
 pkgname=jwm
 version=2.4.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config which"
 makedepends="

Re: [PR PATCH] [Merged]: jwm: remove faulty fix_dvorak.patch

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1279 bytes --]

There's a merged pull request on the void-packages repository

jwm: remove faulty fix_dvorak.patch
https://github.com/void-linux/void-packages/pull/36051

Description:
@paper42 sorry that I noticed this late.
The segfault mentioned in the already closed #35962 was caused by the fix-dvorak.patch.
It's from https://github.com/joewing/jwm/pull/481 and still not upstreamed.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->