[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

Re: gEDA-user: This patch is breaking compile



On Fri, 19 Aug 2011, Markus Hitter wrote:


Am 15.08.2011 um 22:37 schrieb kqt4at5v@xxxxxxxxxxx:

I was especially interested in the drillmill function but I have not been able to get that to work
I check the box and only get plain drilling

Did you look into the "outline" G-code file? As drill-milling and outline milling often uses the same tool, I've put the drill-mills there.


A fresh 'git pull' broke this patch again

###### 0001-HID-gcode-let-the-system-library-allocate-the-tempor.patch

patching file src/hid/gcode/gcode.c
Hunk #2 succeeded at 314 (offset 10 lines).
Hunk #3 succeeded at 440 (offset -2 lines).


###### 0002-HID-gcode-make-use-of-MAXPATHLEN.patch

patching file src/hid/gcode/gcode.c
Hunk #1 succeeded at 448 (offset -2 lines).


###### 0003-HID-gcode-get-rid-of-tabulators-in-gcode.c.-Pure-whi.patch

patching file src/hid/gcode/gcode.c
Hunk #5 succeeded at 252 (offset 10 lines).
Hunk #6 succeeded at 277 (offset 10 lines).
Hunk #7 succeeded at 380 (offset 11 lines).
Hunk #8 succeeded at 397 (offset 11 lines).
Hunk #9 FAILED at 405.
Hunk #10 succeeded at 429 (offset -2 lines).
Hunk #11 succeeded at 735 (offset -2 lines).
Hunk #12 succeeded at 748 (offset -2 lines).
Hunk #13 succeeded at 805 (offset -2 lines).
Hunk #14 succeeded at 839 (offset -2 lines).
Hunk #15 succeeded at 853 (offset -2 lines).
Hunk #16 FAILED at 876.
Hunk #17 succeeded at 909 (offset -10 lines).
Hunk #18 succeeded at 931 (offset -10 lines).
2 out of 18 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


###### 0004-HID-gcode-create-better-file-names.patch

patching file src/hid/gcode/gcode.c
Hunk #1 FAILED at 116.
Hunk #4 succeeded at 278 (offset 10 lines).
Hunk #5 succeeded at 430 (offset 11 lines).
Hunk #6 succeeded at 494 (offset -2 lines).
Hunk #7 succeeded at 562 (offset -2 lines).
1 out of 7 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


###### 0005-HID-gcode-add-a-flag-wether-to-produce-advanced-G-co.patch

patching file src/hid/gcode/gcode.c
Hunk #2 succeeded at 177 with fuzz 1.
Hunk #3 succeeded at 424 (offset 11 lines).
Hunk #4 succeeded at 458 (offset -2 lines).
Hunk #5 succeeded at 547 (offset -2 lines).
Hunk #6 succeeded at 566 (offset -2 lines).
Hunk #7 succeeded at 607 (offset -2 lines).
patching file src/hid/gcode/trace.c
patching file src/hid/gcode/trace.h


###### 0006-HID-gcode-Avoid-more-than-one-G-or-M-code-per-line-f.patch

patching file src/hid/gcode/gcode.c
Hunk #1 succeeded at 553 (offset -2 lines).
Hunk #2 succeeded at 586 (offset -2 lines).
Hunk #3 succeeded at 622 (offset -2 lines).
Hunk #4 succeeded at 654 (offset -2 lines).


###### 0007-HID-gcode-switch-from-tool-radius-to-tool-diameter-i.patch

patching file src/hid/gcode/gcode.c
Hunk #2 succeeded at 457 (offset -2 lines).


###### 0008-HID-gcode-add-a-comment-about-the-tool-diameter-into.patch

patching file src/hid/gcode/gcode.c
Hunk #2 succeeded at 542 (offset -2 lines).


###### 0009-HID-gcode-simplify-code-a-bit.patch

patching file src/hid/gcode/gcode.c
Hunk #1 succeeded at 639 (offset -2 lines).


###### 0010-HID-gcode-use-drill-cycles-only-for-advanced-G-code.patch

patching file src/hid/gcode/gcode.c
Hunk #2 succeeded at 636 (offset -2 lines).
Hunk #3 succeeded at 651 (offset -2 lines).


###### 0011-HID-gcode-postpone-closing-the-mill-file-until-the-d.patch

patching file src/hid/gcode/gcode.c
Hunk #2 FAILED at 396.
Hunk #3 succeeded at 576 (offset -2 lines).
Hunk #4 succeeded at 644 (offset -2 lines).
1 out of 4 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


###### 0012-HID-gcode-finally-add-predrilling.patch

patching file src/hid/gcode/gcode.c
Hunk #2 FAILED at 171.
Hunk #3 succeeded at 455 with fuzz 2 (offset -2 lines).
Hunk #4 succeeded at 595 (offset -2 lines).
Hunk #5 succeeded at 647 (offset -2 lines).
Hunk #6 succeeded at 669 (offset -2 lines).
1 out of 6 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


###### 0013-HID-gcode-enhance-accuracy-of-the-distance-report-fo.patch

patching file src/hid/gcode/gcode.c
Hunk #1 succeeded at 592 (offset -8 lines).
Hunk #2 succeeded at 676 (offset -8 lines).
Hunk #3 succeeded at 693 (offset -8 lines).


###### 0014-HID-gcode-remove-a-leftover-debug-printf.patch

patching file src/hid/gcode/gcode.c
Hunk #1 succeeded at 485 (offset -8 lines).


###### 0015-HID-gcode-provide-info-about-drill-diameters-in-G-co.patch

patching file src/hid/gcode/gcode.c
Hunk #3 succeeded at 595 (offset -8 lines).
Hunk #4 succeeded at 641 (offset -8 lines).
Hunk #5 succeeded at 661 (offset -8 lines).
Hunk #6 succeeded at 1062 (offset -16 lines).


###### 0016-HID-gcode-sort-drills-not-only-by-distance-but-also-.patch

patching file src/hid/gcode/gcode.c
Hunk #1 succeeded at 226 (offset -6 lines).
Hunk #2 succeeded at 259 (offset -6 lines).
Hunk #3 succeeded at 613 (offset -8 lines).


###### 0017-HID-gcode-report-one-drill-diameter-only-once-in-the.patch

patching file src/hid/gcode/gcode.c
Hunk #1 succeeded at 677 (offset -8 lines).


###### 0018-HID-gcode-don-t-do-isolation-milling-on-the-outline-.patch

patching file src/hid/gcode/gcode.c
Hunk #1 succeeded at 325 (offset 4 lines).
Hunk #2 succeeded at 728 (offset -8 lines).


###### 0019-HID-gcode-fetch-the-board-s-extents-from-the-outline.patch

patching file src/hid/gcode/gcode.c
Hunk #2 succeeded at 206 (offset -6 lines).
Hunk #3 succeeded at 526 (offset -8 lines).
Hunk #4 succeeded at 613 (offset -8 lines).
Hunk #5 succeeded at 686 (offset -8 lines).


###### 0020-HID-gcode-limit-the-produced-G-code-to-the-outline.patch

patching file src/hid/gcode/gcode.c
Hunk #1 succeeded at 415 (offset 4 lines).
Hunk #2 succeeded at 445 (offset 4 lines).
Hunk #3 succeeded at 1034 (offset -8 lines).
Hunk #4 succeeded at 1049 (offset -8 lines).
Hunk #5 FAILED at 1078.
Hunk #6 succeeded at 1114 (offset -16 lines).
Hunk #7 succeeded at 1129 (offset -16 lines).
Hunk #8 succeeded at 1145 (offset -16 lines).
Hunk #9 succeeded at 1168 (offset -16 lines).
1 out of 9 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


###### 0021-HID-gcode-reorder-user-interface-to-a-more-logical-s.patch

patching file src/hid/gcode/gcode.c
Hunk #1 FAILED at 160.
1 out of 1 hunk FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


###### 0022-HID-gcode-create-G-code-for-milling-the-outline-of-t.patch

patching file src/hid/gcode/gcode.c
Hunk #3 FAILED at 193.
Hunk #4 succeeded at 489 (offset 6 lines).
Hunk #5 succeeded at 523 (offset -7 lines).
Hunk #6 succeeded at 836 (offset -7 lines).
1 out of 6 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


###### 0023-HID-gcode-move-all-the-code-common-on-file-open-into.patch

patching file src/hid/gcode/gcode.c
Hunk #2 succeeded at 278 (offset -15 lines).
Hunk #3 FAILED at 506.
Hunk #4 FAILED at 552.
Hunk #5 succeeded at 580 (offset -17 lines).
Hunk #6 succeeded at 592 (offset -17 lines).
Hunk #7 succeeded at 622 (offset -17 lines).
Hunk #8 succeeded at 641 (offset -17 lines).
Hunk #9 succeeded at 653 (offset -17 lines).
Hunk #10 succeeded at 668 (offset -17 lines).
Hunk #11 succeeded at 686 (offset -17 lines).
Hunk #12 succeeded at 695 (offset -17 lines).
Hunk #13 succeeded at 712 (offset -17 lines).
Hunk #14 succeeded at 724 (offset -17 lines).
Hunk #15 succeeded at 758 (offset -17 lines).
Hunk #16 succeeded at 783 (offset -17 lines).
Hunk #17 succeeded at 803 (offset -17 lines).
Hunk #18 succeeded at 838 (offset -17 lines).
Hunk #19 succeeded at 869 (offset -17 lines).
2 out of 19 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


###### 0024-HID-gcode-refine-the-user-interface-regarding-accura.patch

patching file src/hid/gcode/gcode.c
Hunk #1 FAILED at 168.
Hunk #2 FAILED at 540.
2 out of 2 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


###### 0025-HID-gcode-add-user-defined-feedrates-for-isolation-m.patch

patching file src/hid/gcode/gcode.c
Hunk #2 FAILED at 187.
Hunk #3 succeeded at 524 (offset -3 lines).
Hunk #4 succeeded at 553 with fuzz 2 (offset -11 lines).
Hunk #5 succeeded at 572 (offset -11 lines).
Hunk #6 succeeded at 675 (offset -11 lines).
Hunk #7 succeeded at 700 (offset -11 lines).
Hunk #8 succeeded at 725 (offset -11 lines).
1 out of 8 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej
patching file src/hid/gcode/trace.c
patching file src/hid/gcode/trace.h


###### 0026-HID-gcode-add-user-defined-feedrates-for-drilling.patch

patching file src/hid/gcode/gcode.c
Hunk #2 FAILED at 207.
Hunk #3 succeeded at 558 with fuzz 2 (offset -20 lines).
Hunk #4 succeeded at 742 (offset -20 lines).
1 out of 4 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


###### 0027-HID-gcode-add-user-defined-feedrates-for-outline-mil.patch

patching file src/hid/gcode/gcode.c
Hunk #2 FAILED at 223.
Hunk #3 succeeded at 529 (offset -16 lines).
Hunk #4 succeeded at 568 (offset -24 lines).
Hunk #5 succeeded at 583 (offset -24 lines).
Hunk #6 succeeded at 594 (offset -24 lines).
Hunk #7 succeeded at 610 (offset -24 lines).
Hunk #8 succeeded at 889 (offset -24 lines).
1 out of 8 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


###### 0028-HID-gcode-implement-drill-milling.patch

patching file src/hid/gcode/gcode.c
Hunk #2 FAILED at 214.
Hunk #3 succeeded at 567 with fuzz 1 (offset -33 lines).
Hunk #4 succeeded at 769 (offset -33 lines).
Hunk #5 succeeded at 926 (offset -33 lines).
1 out of 5 hunks FAILED -- saving rejects to file src/hid/gcode/gcode.c.rej


Richard


_______________________________________________
geda-user mailing list
geda-user@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-user