joe@gentoo1 ~/dwm (fibi)> git apply --check --verbose --whitespace=nowarn ../patches/dwm-fibonacci-20200418-c82db69.diff Checking patch config.def.h... error: while searching for: static const int nmaster = 1; /* number of clients in master area */ static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ static const Layout layouts[] = { /* symbol arrange function */ { "[]=", tile }, /* first entry is default */ { "><>", NULL }, /* no layout function means floating behavior */ { "[M]", monocle }, }; /* key definitions */ error: patch failed: config.def.h:36 error: config.def.h: patch does not apply Checking patch fibonacci.c... joe@gentoo1 ~/dwm (fibi) [1]> git apply --reject --verbose --whitespace=nowarn ../patches/dwm-fibonacci-20200418-c82db69.diff Checking patch config.def.h... error: while searching for: static const int nmaster = 1; /* number of clients in master area */ static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ static const Layout layouts[] = { /* symbol arrange function */ { "[]=", tile }, /* first entry is default */ { "><>", NULL }, /* no layout function means floating behavior */ { "[M]", monocle }, }; /* key definitions */ error: patch failed: config.def.h:36 error: while searching for: { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, { MODKEY, XK_space, setlayout, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, error: patch failed: config.def.h:76 Checking patch fibonacci.c... Applying patch config.def.h with 2 rejects... Rejected hunk #1. Rejected hunk #2. Applied patch fibonacci.c cleanly. joe@gentoo1 ~/dwm (fibi) [1]> vim config.def.h.rej joe@gentoo1 ~/dwm (fibi)> sudo make install clean --dry-run Password: cc -c -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os -I/usr/X11R6/include -I/usr/include/freetype2 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"6.5\" -DXINERAMA dwm.c cc -c -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os -I/usr/X11R6/include -I/usr/include/freetype2 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"6.5\" -DXINERAMA util.c cc -o dwm drw.o dwm.o util.o -L/usr/X11R6/lib -lX11 -lXinerama -lfontconfig -lXft mkdir -p /usr/local/bin cp -f dwm /usr/local/bin chmod 755 /usr/local/bin/dwm mkdir -p /usr/local/share/man/man1 sed "s/VERSION/6.5/g" < dwm.1 > /usr/local/share/man/man1/dwm.1 chmod 644 /usr/local/share/man/man1/dwm.1 rm -f dwm drw.o dwm.o util.o dwm-6.5.tar.gz joe@gentoo1 ~/dwm (fibi)> git add . joe@gentoo1 ~/dwm (fibi)> git commit -m "added fibi layout patch" [fibi 2ca52de] added fibi layout patch 5 files changed, 246 insertions(+), 10 deletions(-) create mode 100644 .config.def.h.swp create mode 100644 config.h create mode 100644 fibonacci.c joe@gentoo1 ~/dwm (fibi)> sudo make install clean cc -c -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os -I/usr/X11R6/include -I/usr/include/freetype2 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"6.5\" -DXINERAMA dwm.c In file included from dwm.c:318: config.h:54:23: error: ‘spiral’ undeclared here (not in a function) 54 | { "[@]", spiral }, | ^~~~~~ config.h:55:24: error: ‘dwindle’ undeclared here (not in a function) 55 | { "[\\]", dwindle }, | ^~~~~~~ make: *** [Makefile:12: dwm.o] Error 1