On Fri, Oct 16, 2009 at 8:14 AM, Axel Dörfler <axeld@xxxxxxxxxxxxxxxx> wrote: > Hong Yul Yang <hongyul.yang@xxxxxxxxx> wrote: >> One thing to note is that it's set against the same release as the >> one I >> previously posted (r32151 and possibly later) - please let me know if >> this >> is going to be a major hassle for patching! > > This might indeed be problematic, although I haven't tried yet, there > were some changes in the app_server since then. > To give you an incentive to update your tree, I've committed the > linprog.diff to the repository, which applied without any problems. > Yeah, the stack-and-tile.diff doesn't apply cleanly to r33609, unfortunately. joe@wind:~/haiku/trunk$ patch --dry-run -p1 -i stack-and-tile.diff patching file src/servers/app/Decorator.cpp patching file src/servers/app/Decorator.h patching file src/servers/app/DefaultDecorator.cpp Hunk #3 succeeded at 434 (offset 2 lines). Hunk #4 succeeded at 626 (offset 2 lines). Hunk #5 FAILED at 1137. Hunk #6 succeeded at 1619 (offset 12 lines). 1 out of 6 hunks FAILED -- saving rejects to file src/servers/app/DefaultDecorator.cpp.rej patching file src/servers/app/DefaultDecorator.h Hunk #3 succeeded at 93 (offset 1 line). Hunk #4 succeeded at 105 with fuzz 1 (offset 1 line). Hunk #5 succeeded at 132 (offset 1 line). patching file src/servers/app/Desktop.cpp Hunk #1 succeeded at 176 with fuzz 2 (offset 5 lines). Hunk #2 succeeded at 208 (offset 5 lines). Hunk #3 succeeded at 327 with fuzz 2 (offset 6 lines). Hunk #4 succeeded at 373 (offset 9 lines). Hunk #5 succeeded at 943 (offset -775 lines). Hunk #6 succeeded at 967 (offset -775 lines). Hunk #7 succeeded at 1039 (offset -775 lines). Hunk #8 FAILED at 2171. 1 out of 8 hunks FAILED -- saving rejects to file src/servers/app/Desktop.cpp.rej patching file src/servers/app/Desktop.h Hunk #1 succeeded at 34 with fuzz 2 (offset 1 line). Hunk #2 FAILED at 223. Hunk #3 FAILED at 277. 2 out of 3 hunks FAILED -- saving rejects to file src/servers/app/Desktop.h.rej patching file src/servers/app/Jamfile Hunk #2 succeeded at 66 with fuzz 2 (offset 2 lines). patching file src/servers/app/ServerWindow.cpp Hunk #1 FAILED at 962. Hunk #2 FAILED at 990. 2 out of 2 hunks FAILED -- saving rejects to file src/servers/app/ServerWindow.cpp.rej patching file src/servers/app/Window.cpp Hunk #3 succeeded at 142 (offset 1 line). Hunk #5 succeeded at 819 (offset 12 lines). Hunk #6 succeeded at 1037 with fuzz 1 (offset 118 lines). Hunk #7 succeeded at 1046 (offset 16 lines). Hunk #8 succeeded at 1188 (offset 16 lines). Hunk #9 succeeded at 1218 (offset 16 lines). Hunk #10 succeeded at 1528 (offset 10 lines). Hunk #11 succeeded at 1540 (offset 10 lines). Hunk #12 succeeded at 2440 (offset 30 lines). patching file src/servers/app/Window.h Hunk #2 succeeded at 45 with fuzz 2 (offset 2 lines). Hunk #3 succeeded at 250 with fuzz 2 (offset 5 lines). Hunk #4 succeeded at 452 (offset 3 lines). patching file src/servers/app/WorkspacesView.cpp Hunk #1 succeeded at 568 (offset 1 line). - joe