1 | /Data/develop/haiku_svn/trunk> patch -p1 < ~/Desktop/notifications1.patch
|
---|
2 | patching file headers/os/app/Notification.h
|
---|
3 | patching file headers/os/app/Roster.h
|
---|
4 | patching file headers/private/notification/AppUsage.h
|
---|
5 | patching file headers/private/notification/Notifications.h
|
---|
6 | patching file src/bin/notify.cpp
|
---|
7 | patching file src/kits/app/Jamfile
|
---|
8 | patching file src/kits/app/Notification.cpp
|
---|
9 | Hunk #2 FAILED at 13.
|
---|
10 | Hunk #3 succeeded at 110 (offset 1 line).
|
---|
11 | Hunk #5 succeeded at 263 (offset 1 line).
|
---|
12 | Hunk #7 succeeded at 307 (offset 1 line).
|
---|
13 | Hunk #9 succeeded at 448 (offset 1 line).
|
---|
14 | 1 out of 10 hunks FAILED -- saving rejects to file src/kits/app/Notification.cpp.rej
|
---|
15 | patching file src/kits/app/Roster.cpp
|
---|
16 | Hunk #1 succeeded at 37 (offset 1 line).
|
---|
17 | patching file src/kits/notification/AppUsage.cpp
|
---|
18 | patching file src/kits/notification/Notifications.cpp
|
---|
19 | patching file src/preferences/notifications/DisplayView.cpp
|
---|
20 | Reversed (or previously applied) patch detected! Assume -R? [n]
|
---|
21 | Apply anyway? [n]
|
---|
22 | Skipping patch.
|
---|
23 | 5 out of 5 hunks ignored -- saving rejects to file src/preferences/notifications/DisplayView.cpp.rej
|
---|
24 | patching file src/preferences/notifications/DisplayView.h
|
---|
25 | patching file src/servers/notification/AppGroupView.cpp
|
---|
26 | patching file src/servers/notification/AppGroupView.h
|
---|
27 | patching file src/servers/notification/Jamfile
|
---|
28 | Hunk #1 FAILED at 1.
|
---|
29 | 1 out of 1 hunk FAILED -- saving rejects to file src/servers/notification/Jamfile.rej
|
---|
30 | patching file src/servers/notification/NotificationServer.cpp
|
---|
31 | patching file src/servers/notification/NotificationServer.h
|
---|
32 | patching file src/servers/notification/NotificationView.cpp
|
---|
33 | Hunk #9 FAILED at 220.
|
---|
34 | Hunk #11 FAILED at 292.
|
---|
35 | Hunk #12 succeeded at 312 (offset -5 lines).
|
---|
36 | Hunk #13 FAILED at 326.
|
---|
37 | Hunk #15 succeeded at 445 (offset -5 lines).
|
---|
38 | Hunk #17 succeeded at 480 (offset -5 lines).
|
---|
39 | Hunk #19 succeeded at 520 (offset -5 lines).
|
---|
40 | 3 out of 20 hunks FAILED -- saving rejects to file src/servers/notification/NotificationView.cpp.rej
|
---|
41 | patching file src/servers/notification/NotificationView.h
|
---|
42 | patching file src/servers/notification/NotificationWindow.cpp
|
---|
43 | Hunk #1 FAILED at 15.
|
---|
44 | Hunk #2 succeeded at 140 (offset 12 lines).
|
---|
45 | Hunk #3 FAILED at 171.
|
---|
46 | Hunk #4 succeeded at 227 (offset 2 lines).
|
---|
47 | Hunk #5 FAILED at 292.
|
---|
48 | Hunk #6 FAILED at 327.
|
---|
49 | Hunk #7 FAILED at 361.
|
---|
50 | Hunk #8 FAILED at 405.
|
---|
51 | Hunk #9 succeeded at 429 (offset 11 lines).
|
---|
52 | Hunk #10 succeeded at 467 (offset 3 lines).
|
---|
53 | Hunk #11 succeeded at 520 (offset 11 lines).
|
---|
54 | Hunk #12 FAILED at 529.
|
---|
55 | Hunk #13 succeeded at 557 (offset 4 lines).
|
---|
56 | Hunk #14 FAILED at 570.
|
---|
57 | 8 out of 14 hunks FAILED -- saving rejects to file src/servers/notification/NotificationWindow.cpp.rej
|
---|
58 | patching file src/servers/notification/NotificationWindow.h
|
---|