rofl0r / df-mayday Goto Github PK

Hmm...  Looks like a new-style context diff to me...
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/data/init/colors.txt dfg3114/data/init/colors.txt
|*** df_linux/data/init/colors.txt  2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/data/init/colors.txt   2010-09-25 00:03:17.227727040 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 5.
Hunk #2 ignored at 15.
Hunk #3 ignored at 35.
3 out of 3 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 104
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/data/init/d_init.txt dfg3114/data/init/d_init.txt
|*** df_linux/data/init/d_init.txt  2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/data/init/d_init.txt   2010-09-25 00:03:17.227727040 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 16.
Hunk #2 ignored at 77.
Hunk #3 ignored at 97.
3 out of 3 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 135
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Nur in dfg3114/data/init: embark_profiles.txt.
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/data/init/init.txt dfg3114/data/init/init.txt
|*** df_linux/data/init/init.txt    2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/data/init/init.txt 2010-09-25 00:03:17.227727040 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 29.
Hunk #2 ignored at 38.
Hunk #3 ignored at 47.
3 out of 3 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 177
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_amphibians.txt dfg3114/raw/objects/creature_amphibians.txt
|*** df_linux/raw/objects/creature_amphibians.txt   2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_amphibians.txt    2010-09-25 00:03:17.144724577 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 8.
1 out of 1 hunk ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 189
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_annelids.txt dfg3114/raw/objects/creature_annelids.txt
|*** df_linux/raw/objects/creature_annelids.txt 2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_annelids.txt  2010-09-25 00:03:17.135599813 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 8.
1 out of 1 hunk ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 201
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_birds.txt dfg3114/raw/objects/creature_birds.txt
|*** df_linux/raw/objects/creature_birds.txt    2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_birds.txt 2010-09-25 00:03:17.139600252 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 9.
Hunk #2 ignored at 98.
Hunk #3 ignored at 186.
Hunk #4 ignored at 271.
Hunk #5 ignored at 355.
5 out of 5 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 249
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_insects.txt dfg3114/raw/objects/creature_insects.txt
|*** df_linux/raw/objects/creature_insects.txt  2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_insects.txt   2010-09-25 00:03:17.138602988 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 8.
Hunk #2 ignored at 61.
Hunk #3 ignored at 114.
Hunk #4 ignored at 233.
Hunk #5 ignored at 286.
Hunk #6 ignored at 339.
6 out of 6 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 306
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_next_underground.txt dfg3114/raw/objects/creature_next_underground.txt
|*** df_linux/raw/objects/creature_next_underground.txt 2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_next_underground.txt  2010-09-25 00:03:17.136599591 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 9.
Hunk #2 ignored at 408.
2 out of 2 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 327
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_other.txt dfg3114/raw/objects/creature_other.txt
|*** df_linux/raw/objects/creature_other.txt    2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_other.txt 2010-09-25 00:03:17.145724425 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 8.
Hunk #2 ignored at 84.
Hunk #3 ignored at 155.
Hunk #4 ignored at 294.
Hunk #5 ignored at 362.
Hunk #6 ignored at 403.
Hunk #7 ignored at 470.
Hunk #8 ignored at 522.
8 out of 8 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 402
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_reptiles.txt dfg3114/raw/objects/creature_reptiles.txt
|*** df_linux/raw/objects/creature_reptiles.txt 2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_reptiles.txt  2010-09-25 00:03:17.143599574 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 8.
Hunk #2 ignored at 76.
2 out of 2 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 423
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_small_mammals.txt dfg3114/raw/objects/creature_small_mammals.txt
|*** df_linux/raw/objects/creature_small_mammals.txt    2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_small_mammals.txt 2010-09-25 00:03:17.139600252 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 8.
Hunk #2 ignored at 90.
Hunk #3 ignored at 167.
Hunk #4 ignored at 244.
Hunk #5 ignored at 321.
5 out of 5 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 471
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_small_ocean.txt dfg3114/raw/objects/creature_small_ocean.txt
|*** df_linux/raw/objects/creature_small_ocean.txt  2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_small_ocean.txt   2010-09-25 00:03:17.143599574 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 8.
Hunk #2 ignored at 58.
Hunk #3 ignored at 106.
Hunk #4 ignored at 177.
Hunk #5 ignored at 244.
Hunk #6 ignored at 310.
Hunk #7 ignored at 377.
Hunk #8 ignored at 443.
Hunk #9 ignored at 508.
Hunk #10 ignored at 575.
Hunk #11 ignored at 644.
Hunk #12 ignored at 716.
Hunk #13 ignored at 784.
Hunk #14 ignored at 855.
Hunk #15 ignored at 924.
Hunk #16 ignored at 987.
Hunk #17 ignored at 1055.
Hunk #18 ignored at 1117.
Hunk #19 ignored at 1185.
Hunk #20 ignored at 1252.
Hunk #21 ignored at 1321.
21 out of 21 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 663
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_small_riverlake.txt dfg3114/raw/objects/creature_small_riverlake.txt
|*** df_linux/raw/objects/creature_small_riverlake.txt  2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_small_riverlake.txt   2010-09-25 00:03:17.143599574 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 8.
Hunk #2 ignored at 84.
Hunk #3 ignored at 152.
Hunk #4 ignored at 219.
Hunk #5 ignored at 286.
Hunk #6 ignored at 353.
Hunk #7 ignored at 421.
Hunk #8 ignored at 489.
Hunk #9 ignored at 557.
Hunk #10 ignored at 629.
Hunk #11 ignored at 701.
11 out of 11 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 765
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_standard.txt dfg3114/raw/objects/creature_standard.txt
|*** df_linux/raw/objects/creature_standard.txt 2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_standard.txt  2010-09-25 00:03:17.146724483 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 3170.
Hunk #2 ignored at 3344.
2 out of 2 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 786
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/creature_subterranean.txt dfg3114/raw/objects/creature_subterranean.txt
|*** df_linux/raw/objects/creature_subterranean.txt 2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/creature_subterranean.txt  2010-09-25 00:03:17.138602988 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 960.
Hunk #2 ignored at 1035.
Hunk #3 ignored at 1123.
Hunk #4 ignored at 1173.
Hunk #5 ignored at 1214.
Hunk #6 ignored at 1298.
Hunk #7 ignored at 1405.
Hunk #8 ignored at 1716.
8 out of 8 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 861
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/inorganic_stone_gem.txt dfg3114/raw/objects/inorganic_stone_gem.txt
|*** df_linux/raw/objects/inorganic_stone_gem.txt   2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/inorganic_stone_gem.txt    2010-09-25 00:03:17.145724425 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 8.
Hunk #2 ignored at 13.
Hunk #3 ignored at 18.
Hunk #4 ignored at 25.
Hunk #5 ignored at 30.
Hunk #6 ignored at 35.
Hunk #7 ignored at 41.
Hunk #8 ignored at 46.
Hunk #9 ignored at 51.
Hunk #10 ignored at 56.
Hunk #11 ignored at 61.
Hunk #12 ignored at 66.
Hunk #13 ignored at 71.
Hunk #14 ignored at 76.
Hunk #15 ignored at 81.
Hunk #16 ignored at 86.
Hunk #17 ignored at 91.
Hunk #18 ignored at 96.
Hunk #19 ignored at 101.
Hunk #20 ignored at 106.
Hunk #21 ignored at 111.
Hunk #22 ignored at 116.
Hunk #23 ignored at 121.
Hunk #24 ignored at 126.
Hunk #25 ignored at 131.
Hunk #26 ignored at 136.
Hunk #27 ignored at 141.
Hunk #28 ignored at 146.
Hunk #29 ignored at 151.
Hunk #30 ignored at 156.
Hunk #31 ignored at 161.
Hunk #32 ignored at 166.
Hunk #33 ignored at 171.
Hunk #34 ignored at 176.
Hunk #35 ignored at 181.
Hunk #36 ignored at 186.
Hunk #37 ignored at 192.
Hunk #38 ignored at 197.
Hunk #39 ignored at 202.
Hunk #40 ignored at 210.
Hunk #41 ignored at 216.
Hunk #42 ignored at 222.
Hunk #43 ignored at 228.
Hunk #44 ignored at 234.
Hunk #45 ignored at 239.
Hunk #46 ignored at 244.
Hunk #47 ignored at 249.
Hunk #48 ignored at 254.
Hunk #49 ignored at 259.
Hunk #50 ignored at 264.
Hunk #51 ignored at 269.
Hunk #52 ignored at 274.
Hunk #53 ignored at 279.
Hunk #54 ignored at 284.
Hunk #55 ignored at 289.
Hunk #56 ignored at 296.
Hunk #57 ignored at 301.
Hunk #58 ignored at 308.
Hunk #59 ignored at 314.
Hunk #60 ignored at 321.
Hunk #61 ignored at 326.
Hunk #62 ignored at 333.
Hunk #63 ignored at 340.
Hunk #64 ignored at 345.
Hunk #65 ignored at 352.
Hunk #66 ignored at 358.
Hunk #67 ignored at 364.
Hunk #68 ignored at 369.
Hunk #69 ignored at 376.
Hunk #70 ignored at 381.
Hunk #71 ignored at 387.
Hunk #72 ignored at 394.
Hunk #73 ignored at 400.
Hunk #74 ignored at 407.
Hunk #75 ignored at 412.
Hunk #76 ignored at 419.
Hunk #77 ignored at 426.
Hunk #78 ignored at 431.
Hunk #79 ignored at 437.
Hunk #80 ignored at 444.
Hunk #81 ignored at 452.
Hunk #82 ignored at 457.
Hunk #83 ignored at 464.
Hunk #84 ignored at 470.
Hunk #85 ignored at 477.
Hunk #86 ignored at 482.
Hunk #87 ignored at 487.
Hunk #88 ignored at 494.
Hunk #89 ignored at 499.
Hunk #90 ignored at 505.
Hunk #91 ignored at 511.
Hunk #92 ignored at 518.
Hunk #93 ignored at 524.
Hunk #94 ignored at 530.
Hunk #95 ignored at 535.
Hunk #96 ignored at 540.
Hunk #97 ignored at 547.
Hunk #98 ignored at 554.
Hunk #99 ignored at 561.
Hunk #100 ignored at 568.
Hunk #101 ignored at 574.
Hunk #102 ignored at 579.
Hunk #103 ignored at 586.
Hunk #104 ignored at 593.
Hunk #105 ignored at 600.
Hunk #106 ignored at 605.
Hunk #107 ignored at 610.
Hunk #108 ignored at 615.
Hunk #109 ignored at 620.
Hunk #110 ignored at 625.
Hunk #111 ignored at 630.
Hunk #112 ignored at 635.
Hunk #113 ignored at 640.
Hunk #114 ignored at 645.
Hunk #115 ignored at 650.
Hunk #116 ignored at 662.
Hunk #117 ignored at 672.
Hunk #118 ignored at 679.
Hunk #119 ignored at 684.
Hunk #120 ignored at 691.
Hunk #121 ignored at 701.
Hunk #122 ignored at 711.
Hunk #123 ignored at 721.
Hunk #124 ignored at 731.
Hunk #125 ignored at 741.
Hunk #126 ignored at 751.
Hunk #127 ignored at 756.
127 out of 127 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 2007
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/inorganic_stone_layer.txt dfg3114/raw/objects/inorganic_stone_layer.txt
|*** df_linux/raw/objects/inorganic_stone_layer.txt 2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/inorganic_stone_layer.txt  2010-09-25 00:03:17.145724425 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 19.
Hunk #2 ignored at 25.
Hunk #3 ignored at 43.
Hunk #4 ignored at 90.
Hunk #5 ignored at 118.
Hunk #6 ignored at 158.
Hunk #7 ignored at 184.
7 out of 7 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 2073
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/inorganic_stone_mineral.txt dfg3114/raw/objects/inorganic_stone_mineral.txt
|*** df_linux/raw/objects/inorganic_stone_mineral.txt   2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/inorganic_stone_mineral.txt    2010-09-25 00:03:17.146724483 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 6.
Hunk #2 ignored at 18.
Hunk #3 ignored at 28.
Hunk #4 ignored at 47.
Hunk #5 ignored at 87.
Hunk #6 ignored at 127.
Hunk #7 ignored at 159.
Hunk #8 ignored at 170.
Hunk #9 ignored at 186.
Hunk #10 ignored at 197.
Hunk #11 ignored at 241.
Hunk #12 ignored at 274.
Hunk #13 ignored at 284.
Hunk #14 ignored at 293.
Hunk #15 ignored at 304.
Hunk #16 ignored at 316.
Hunk #17 ignored at 339.
Hunk #18 ignored at 345.
Hunk #19 ignored at 369.
Hunk #20 ignored at 380.
Hunk #21 ignored at 387.
Hunk #22 ignored at 398.
Hunk #23 ignored at 416.
Hunk #24 ignored at 424.
Hunk #25 ignored at 473.
Hunk #26 ignored at 496.
Hunk #27 ignored at 570.
Hunk #28 ignored at 593.
Hunk #29 ignored at 601.
Hunk #30 ignored at 610.
Hunk #31 ignored at 702.
31 out of 31 hunks ignored
Hmm...  The next patch looks like a new-style context diff to me...
can't find file to patch at input line 2357
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Nur in dfg3114/raw/objects: inorganic_stone_mineral.txt~.
|Nur in dfg3114/raw/objects: inorganic_stone_mineral.txt.orig.
|diff -r -C1 '--exclude=language*' -w -B -E df_linux/raw/objects/plant_standard.txt dfg3114/raw/objects/plant_standard.txt
|*** df_linux/raw/objects/plant_standard.txt    2010-09-23 16:35:46.000000000 +0200
|--- dfg3114/raw/objects/plant_standard.txt 2010-09-25 00:03:17.144724577 +0200
--------------------------
File to patch: 
Skip this patch? [y] 
Skipping patch.
Hunk #1 ignored at 21.
Hunk #2 ignored at 53.
Hunk #3 ignored at 90.
Hunk #4 ignored at 134.
Hunk #5 ignored at 145.
Hunk #6 ignored at 190.
Hunk #7 ignored at 201.
Hunk #8 ignored at 220.
Hunk #9 ignored at 258.
Hunk #10 ignored at 281.
Hunk #11 ignored at 315.
Hunk #12 ignored at 345.
Hunk #13 ignored at 412.
Hunk #14 ignored at 467.
Hunk #15 ignored at 524.
Hunk #16 ignored at 546.
Hunk #17 ignored at 643.
Hunk #18 ignored at 708.
Hunk #19 ignored at 722.
Hunk #20 ignored at 735.
Hunk #21 ignored at 753.
Hunk #22 ignored at 770.
Hunk #23 ignored at 786.
Hunk #24 ignored at 801.
Hunk #25 ignored at 818.
Hunk #26 ignored at 833.
Hunk #27 ignored at 851.
Hunk #28 ignored at 877.
Hunk #29 ignored at 898.
Hunk #30 ignored at 920.
Hunk #31 ignored at 941.
Hunk #32 ignored at 962.
Hunk #33 ignored at 983.
Hunk #34 ignored at 1004.
Hunk #35 ignored at 1026.
Hunk #36 ignored at 1049.
Hunk #37 ignored at 1067.
Hunk #38 ignored at 1084.
Hunk #39 ignored at 1100.
Hunk #40 ignored at 1118.
Hunk #41 ignored at 1137.
Hunk #42 ignored at 1154.
Hunk #43 ignored at 1172.
Hunk #44 ignored at 1188.
Hunk #45 ignored at 1202.
Hunk #46 ignored at 1216.
Hunk #47 ignored at 1230.
Hunk #48 ignored at 1244.
48 out of 48 hunks ignored
done

*** Error(s) found in the file "raw/graphics/graphics_mayday.txt"
Unrecognized Creature Texture Token: ZOMBIE
Unrecognized Creature Texture Token: SKELETON
Unrecognized Creature Texture Token: ZOMBIE

jeff@mbp:~/src$ cd df_linux/
jeff@mbp:~/src/df_linux$ cp -Rf ../df-mayday/* ./
jeff@mbp:~/src/df_linux$ ./mayday-patch.sh 
*** mayday-patchset for POSIX by rofl0r ***
-ne 

trying to apply mayday.diff....
-ne there were some errors, manual intervention is required

Hunk #95 FAILED at 735. 1 out of 129 hunks FAILED -- saving rejects to file raw/objects/inorganic_stone_gem.txt.rej
for more details see mayday-patch.log