Advertisement
Guest User

emam patch

a guest
Jan 2nd, 2013
145
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.64 KB | None | 0 0
  1. :~/Downloads/mame$ patch -p0 -E <hi.diff
  2. (Stripping trailing CRs from patch.)
  3. patching file src/emu/emu.mak
  4. Hunk #1 FAILED at 41.
  5. Hunk #2 FAILED at 77.
  6. 2 out of 2 hunks FAILED -- saving rejects to file src/emu/emu.mak.rej
  7. (Stripping trailing CRs from patch.)
  8. patching file src/emu/emuopts.c
  9. Hunk #1 FAILED at 82.
  10. Hunk #2 FAILED at 195.
  11. 2 out of 2 hunks FAILED -- saving rejects to file src/emu/emuopts.c.rej
  12. (Stripping trailing CRs from patch.)
  13. patching file src/emu/emuopts.h
  14. Hunk #1 FAILED at 95.
  15. Hunk #2 FAILED at 199.
  16. Hunk #3 FAILED at 251.
  17. Hunk #4 FAILED at 349.
  18. 4 out of 4 hunks FAILED -- saving rejects to file src/emu/emuopts.h.rej
  19. (Stripping trailing CRs from patch.)
  20. patching file src/emu/hiscore.c
  21. (Stripping trailing CRs from patch.)
  22. patching file src/emu/hiscore.h
  23. (Stripping trailing CRs from patch.)
  24. patching file src/emu/machine.c
  25. Hunk #1 FAILED at 110.
  26. Hunk #2 FAILED at 132.
  27. Hunk #3 FAILED at 195.
  28. Hunk #4 FAILED at 318.
  29. 4 out of 4 hunks FAILED -- saving rejects to file src/emu/machine.c.rej
  30. (Stripping trailing CRs from patch.)
  31. patching file src/emu/machine.h
  32. Hunk #1 FAILED at 288.
  33. 1 out of 1 hunk FAILED -- saving rejects to file src/emu/machine.h.rej
  34. (Stripping trailing CRs from patch.)
  35. patching file src/emu/mame.c
  36. Hunk #1 FAILED at 79.
  37. 1 out of 1 hunk FAILED -- saving rejects to file src/emu/mame.c.rej
  38. (Stripping trailing CRs from patch.)
  39. patching file src/emu/profiler.c
  40. Hunk #1 FAILED at 192.
  41. 1 out of 1 hunk FAILED -- saving rejects to file src/emu/profiler.c.rej
  42. (Stripping trailing CRs from patch.)
  43. patching file src/emu/profiler.h
  44. Hunk #1 FAILED at 78.
  45. 1 out of 1 hunk FAILED -- saving rejects to file src/emu/profiler.h.rej
  46. (Stripping trailing CRs from patch.)
  47. patching file src/emu/romload.c
  48. Hunk #1 FAILED at 468.
  49. 1 out of 1 hunk FAILED -- saving rejects to file src/emu/romload.c.rej
  50. (Stripping trailing CRs from patch.)
  51. patching file src/emu/ui.c
  52. Hunk #1 FAILED at 336.
  53. Hunk #2 FAILED at 352.
  54. Hunk #3 FAILED at 362.
  55. Hunk #4 FAILED at 389.
  56. 4 out of 4 hunks FAILED -- saving rejects to file src/emu/ui.c.rej
  57. (Stripping trailing CRs from patch.)
  58. patching file src/emu/video.c
  59. Hunk #1 FAILED at 491.
  60. 1 out of 1 hunk FAILED -- saving rejects to file src/emu/video.c.rej
  61. (Stripping trailing CRs from patch.)
  62. patching file src/emu/video.h
  63. Hunk #1 FAILED at 102.
  64. Hunk #2 FAILED at 206.
  65. 2 out of 2 hunks FAILED -- saving rejects to file src/emu/video.h.rej
  66. (Stripping trailing CRs from patch.)
  67. patching file src/mame/machine/cps2crpt.c
  68. Hunk #1 FAILED at 111.
  69. Hunk #2 FAILED at 672.
  70. 2 out of 2 hunks FAILED -- saving rejects to file src/mame/machine/cps2crpt.c.rej
  71. (Stripping trailing CRs from patch.)
  72. patching file src/osd/osdepend.c
  73. Hunk #1 FAILED at 115.
  74. 1 out of 1 hunk FAILED -- saving rejects to file src/osd/osdepend.c.rej
  75. (Stripping trailing CRs from patch.)
  76. patching file src/osd/osdepend.h
  77. Hunk #1 FAILED at 93.
  78. 1 out of 1 hunk FAILED -- saving rejects to file src/osd/osdepend.h.rej
  79. (Stripping trailing CRs from patch.)
  80. patching file src/osd/windows/video.c
  81. Hunk #1 FAILED at 226.
  82. 1 out of 1 hunk FAILED -- saving rejects to file src/osd/windows/video.c.rej
  83. (Stripping trailing CRs from patch.)
  84. patching file src/osd/windows/window.c
  85. Hunk #1 FAILED at 825.
  86. 1 out of 1 hunk FAILED -- saving rejects to file src/osd/windows/window.c.rej
  87. (Stripping trailing CRs from patch.)
  88. patching file src/osd/windows/window.h
  89. Hunk #1 FAILED at 150.
  90. 1 out of 1 hunk FAILED -- saving rejects to file src/osd/windows/window.h.rej
  91. (Stripping trailing CRs from patch.)
  92. patching file src/osd/windows/winmain.h
  93. Hunk #1 FAILED at 323.
  94. 1 out of 1 hunk FAILED -- saving rejects to file src/osd/windows/winmain.h.rej
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement