Merge pull request #3075 from 01micko/bugfix-jwm

rootfs-petbuilds/jwm: bugfix for 'move' bug. closes #3073
puppylinux-woof-CE · May 9, 2022 · 168295b · 168295b
2 parents 89b7665 + a99b896
commit 168295b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/woof-code/rootfs-petbuilds/jwm/move-237.patch b/woof-code/rootfs-petbuilds/jwm/move-237.patch
@@ -0,0 +1,16 @@
+This patch fixes petbuild JWM-2.3.7 crash report #3073
+reported by 'gychang' 
+https://forum.puppylinux.com/viewtopic.php?p=56878#p56878
+fix from jwm by author 'rdnvdr' - Andrey Rodionov 20170930
+commit bc58de37452d843e6e2e50b4c67be1f1585a6ccb
+diff -rupN jwm-2.3.7.orig/src/move.c jwm-2.3.7/src/move.c
+--- jwm-2.3.7.orig/src/move.c	2022-05-09 12:57:19.033983641 +1000
++++ jwm-2.3.7/src/move.c	2022-05-09 12:58:50.537984994 +1000
+@@ -333,6 +333,7 @@ char MoveClientKeyboard(ClientNode *np)
+    } else {
+       height = np->height;
+    }
++   currentClient = np;
+
+    for(;;) {
+
diff --git a/woof-code/rootfs-petbuilds/jwm/petbuild b/woof-code/rootfs-petbuilds/jwm/petbuild
@@ -5,6 +5,7 @@ download() {
 build() {
     tar -xJf jwm-2.3.7.tar.xz
     cd jwm-2.3.7
+    patch -p1 < ../move-237.patch
     ./configure --prefix=/usr --sysconfdir=/etc
     make install
-}
+}