Re: [PR PATCH] [Updated] jwm: update to 2.4.1.

[tibequadorian <tibequadorian@users.noreply.github.com>]

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

There is an updated 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/35934

jwm: update to 2.4.1.
<!-- 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/35934.patch is attached

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

From b2d6fd58e323eee2b7ee512aeb44c8d508d3b8a4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 23:38:58 +0100
Subject: [PATCH] jwm: update to 2.4.1.

---
 srcpkgs/jwm/patches/fix_dvorak.patch | 19 ++++++++++++++-----
 srcpkgs/jwm/template                 | 10 +++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/jwm/patches/fix_dvorak.patch b/srcpkgs/jwm/patches/fix_dvorak.patch
index 6bef1082369b..a8c1a02a9c5b 100644
--- a/srcpkgs/jwm/patches/fix_dvorak.patch
+++ b/srcpkgs/jwm/patches/fix_dvorak.patch
@@ -1,7 +1,16 @@
-diff --git src/key.c src/key.c
-index 4b00d26..caefe42 100644
---- a/src/key.c
-+++ b/src/key.c
+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"
@@ -11,7 +20,7 @@ index 4b00d26..caefe42 100644
  #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,
+@@ -418,7 +420,7 @@ void InsertBinding(ActionType action, const char *modifiers,
  
              for(temp[offset] = '1'; temp[offset] <= '9'; temp[offset]++) {
  
diff --git a/srcpkgs/jwm/template b/srcpkgs/jwm/template
index 96efe18d60cc..923db1630750 100644
--- a/srcpkgs/jwm/template
+++ b/srcpkgs/jwm/template
@@ -1,20 +1,20 @@
 # Template file for 'jwm'
 pkgname=jwm
-version=2.3.7
-revision=2
+version=2.4.1
+revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config which"
 makedepends="
  librsvg-devel libjpeg-turbo-devel libpng-devel libXext-devel
  libXrender-devel libXmu-devel libXft-devel libXinerama-devel
  libXpm-devel fribidi-devel"
-short_desc="A light-weight window manager for the X11 Window System"
-maintainer="rGabiru <rui.flora@gmail.com>"
+short_desc="Light-weight window manager for the X11 Window System"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 conf_files="/etc/system.jwmrc"
 homepage="http://joewing.net/projects/jwm"
 distfiles="http://joewing.net/projects/jwm/releases/jwm-$version.tar.xz"
-checksum=745d2f5df3a4ce9ecc8e75445edb3fbe31dd46c0c26d129cc14de7ad8b665326
+checksum=f3cc6452d8851d1abd374823ada9bbaa6999cbeadeb6dfedd5f9a116659aa233
 
 post_install() {
 	vinstall ${FILESDIR}/jwm.desktop 644 usr/share/xsessions