window-icons.patch no longer applies on i3-4.18

[InfoTeddy]

The last version this patch worked with was with i3-4.15. Since then, it looks like there have been refactors done to parts of the code that the patch modifies, and it no longer applies.

patching file include/atoms_rest.xmacro
patching file include/data.h
Hunk #1 FAILED at 440.
1 out of 1 hunk FAILED -- saving rejects to file include/data.h.rej
patching file include/libi3.h
Hunk #1 succeeded at 613 (offset 27 lines).
patching file include/window.h
Hunk #1 succeeded at 95 (offset 6 lines).
patching file libi3/draw_util.c
Hunk #1 FAILED at 135.
1 out of 1 hunk FAILED -- saving rejects to file libi3/draw_util.c.rej
patching file src/handlers.c
Hunk #1 succeeded at 1276 (offset -11 lines).
Hunk #2 succeeded at 1310 (offset -11 lines).
Hunk #3 succeeded at 1333 (offset -11 lines).
patching file src/manage.c
Hunk #1 succeeded at 121 (offset 30 lines).
Hunk #2 succeeded at 194 with fuzz 2 (offset 30 lines).
Hunk #3 FAILED at 180.
Hunk #4 FAILED at 188.
2 out of 4 hunks FAILED -- saving rejects to file src/manage.c.rej
patching file src/render.c
Hunk #1 succeeded at 96 (offset -29 lines).
patching file src/window.c
Hunk #2 succeeded at 465 (offset 99 lines).
patching file src/x.c
Hunk #1 succeeded at 615 with fuzz 2 (offset 52 lines).
Hunk #2 FAILED at 590.
Hunk #3 FAILED at 629.
2 out of 3 hunks FAILED -- saving rejects to file src/x.c.rej

Attached are the .rej files in question:

• window-icons-rej.zip

[InfoTeddy]

I looked around for a bit and it seems like this patch on the AUR package i3-wm-iconpatch works.