kicad-developers team mailing list archive

[Clemens Koller <cko@xxxxxxxxx>]

Hi, Mathias!

On 2016-01-12 00:06, Mathias Grimmberger wrote:
> I refreshed a part of my patch for rounded rectangle pads (minus the
> plotting stuff, OpenGL canvas, stuff I probably forgot) so everybody
> interested can have a look and play a bit with it, see below.

Unfortunately, your patch doesn't apply cleanly [1]. And it seems
it's not trivial merging /pcbnew/drc_clearance_test_functions.cpp
manually.
Can you rebase your patch, please?

Thanks,

Clemens


-----8<----- [1]
$ patch -p0 <../kicad-dev/Mathias_Grimmberger_roundrect.diff 
patching file common/common_plotDXF_functions.cpp
patching file common/common_plotGERBER_functions.cpp
patching file common/common_plotHPGL_functions.cpp
patching file common/common_plotPS_functions.cpp
patching file common/pcb.keywords
patching file include/pad_shapes.h
patching file include/plot_common.h
patching file pcbnew/board_items_to_polygon_shape_transform.cpp
patching file pcbnew/class_pad.cpp
patching file pcbnew/class_pad.h
patching file pcbnew/class_pad_draw_functions.cpp
patching file pcbnew/dialogs/dialog_pad_properties.cpp
patching file pcbnew/dialogs/dialog_pad_properties_base.cpp
Hunk #1 FAILED at 65.
1 out of 1 hunk FAILED -- saving rejects to file pcbnew/dialogs/dialog_pad_properties_base.cpp.rej
patching file pcbnew/dialogs/dialog_pad_properties_base.fbp
patching file pcbnew/drc_clearance_test_functions.cpp
Hunk #4 succeeded at 616 (offset -2 lines).
Hunk #5 succeeded at 641 (offset -2 lines).
Hunk #6 succeeded at 659 (offset -2 lines).
Hunk #7 FAILED at 731.
Hunk #8 succeeded at 680 with fuzz 1 (offset -76 lines).
Hunk #9 succeeded at 896 (offset -79 lines).
Hunk #10 succeeded at 1069 (offset -79 lines).
1 out of 10 hunks FAILED -- saving rejects to file pcbnew/drc_clearance_test_functions.cpp.rej
patching file pcbnew/exporters/gen_modules_placefile.cpp
patching file pcbnew/kicad_plugin.cpp
patching file pcbnew/pcb_painter.cpp
patching file pcbnew/pcb_parser.cpp
patching file pcbnew/plot_board_layers.cpp
patching file pcbnew/plot_brditems_plotter.cpp
patching file pcbnew/router/pns_router.cpp