kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxx>]

John,

I am getting the following error when I try to apply your patch:

$ git am --ignore-whitespace <
/c/Users/wstambaugh/Documents/Archive/temp/kicad/patches/0001-Documentation-add-logo-to-Doxygen-pages.patch
Applying: Documentation: add logo to Doxygen pages
error: patch failed: pcbnew/CMakeLists.txt:533
error: pcbnew/CMakeLists.txt: patch does not apply
Patch failed at 0001 Documentation: add logo to Doxygen pages
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

It appears to be choking on the pcbnew/CMakeFile.txt.  Is it possible
that you have other changes to this file that are not in the master branch?

Cheers,

Wayne

On 6/13/2018 1:50 PM, John Beard wrote:
> Hi,
> 
> This patch adds a small KiCad logo to the three doxygen documentation
> targets (C++, dev docs and Python docs) for a little bit more flair.
> 
> The image itself is put in the /Documentation dir, but it's not really
> important to the process where it goes.
> 
> Cheers,
> 
> John
> 
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp
>