1. joe@gentoo1 ~/dwm (fibi)> git apply --check --verbose --whitespace=nowarn ../patches/dwm-fibonacci-20200418-c82db69.diff
2. Checking patch config.def.h...
3. error: while searching for:
4. static const int nmaster = 1; /* number of clients in master area */
5. static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
6. ​
7. static const Layout layouts[] = {
8. /* symbol arrange function */
9. { "[]=", tile }, /* first entry is default */
10. { "><>", NULL }, /* no layout function means floating behavior */
11. { "[M]", monocle },
12. };
13. ​
14. /* key definitions */
15. ​
16. error: patch failed: config.def.h:36
17. error: config.def.h: patch does not apply
18. Checking patch fibonacci.c...
19. joe@gentoo1 ~/dwm (fibi) [1]> git apply --reject --verbose --whitespace=nowarn ../patches/dwm-fibonacci-20200418-c82db69.diff
20. Checking patch config.def.h...
21. error: while searching for:
22. static const int nmaster = 1; /* number of clients in master area */
23. static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
24. ​
25. static const Layout layouts[] = {
26. /* symbol arrange function */
27. { "[]=", tile }, /* first entry is default */
28. { "><>", NULL }, /* no layout function means floating behavior */
29. { "[M]", monocle },
30. };
31. ​
32. /* key definitions */
33. ​
34. error: patch failed: config.def.h:36
35. error: while searching for:
36. { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
37. { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
38. { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
39. { MODKEY, XK_space, setlayout, {0} },
40. { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
41. { MODKEY, XK_0, view, {.ui = ~0 } },
42. ​
43. error: patch failed: config.def.h:76
44. Checking patch fibonacci.c...
45. Applying patch config.def.h with 2 rejects...
46. Rejected hunk #1.
47. Rejected hunk #2.
48. Applied patch fibonacci.c cleanly.
49. joe@gentoo1 ~/dwm (fibi) [1]> vim config.def.h.rej
50. joe@gentoo1 ~/dwm (fibi)> sudo make install clean --dry-run
51. Password:
52. 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
53. 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
54. cc -o dwm drw.o dwm.o util.o -L/usr/X11R6/lib -lX11 -lXinerama -lfontconfig -lXft
55. mkdir -p /usr/local/bin
56. cp -f dwm /usr/local/bin
57. chmod 755 /usr/local/bin/dwm
58. mkdir -p /usr/local/share/man/man1
59. sed "s/VERSION/6.5/g" < dwm.1 > /usr/local/share/man/man1/dwm.1
60. chmod 644 /usr/local/share/man/man1/dwm.1
61. rm -f dwm drw.o dwm.o util.o dwm-6.5.tar.gz
62. joe@gentoo1 ~/dwm (fibi)> git add .
63. joe@gentoo1 ~/dwm (fibi)> git commit -m "added fibi layout patch"
64. [fibi 2ca52de] added fibi layout patch
65. 5 files changed, 246 insertions(+), 10 deletions(-)
66. create mode 100644 .config.def.h.swp
67. create mode 100644 config.h
68. create mode 100644 fibonacci.c
69. joe@gentoo1 ~/dwm (fibi)> sudo make install clean
70. 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
71. In file included from dwm.c:318:
72. config.h:54:23: error: ‘spiral’ undeclared here (not in a function)
73. 54 | { "[@]", spiral },
74. | ^~~~~~
75. config.h:55:24: error: ‘dwindle’ undeclared here (not in a function)
76. 55 | { "[\\]", dwindle },
77. | ^~~~~~~
78. make: *** [Makefile:12: dwm.o] Error 1