Add the preserveonrestart patch from https://dwm.suckless.org/patches/preserveonrestart and a custom patch based on https://dwm.suckless.org/patches/restartsig which failed to apply cleanly.
