I had the same problem when I tested the patch on Linux. There seems to be an issue with line endings when bzr creates the diff. I even tried using dos2unix to fix the line endings but no luck. When I get home this evening, I'll create a diff from my Linux repo. Hopefully that will work. I don't have the patch here at work or I would just send you the FindCairo.cmake file so you could just copy over the existing one.
On 12/21/2015 10:14 AM, Adam Wolf wrote: > Hmm. The FindCairo hunks don't seem to apply cleanly to my tree--did I > mess something up in my tree? > > Adam Wolf > > On Sun, Dec 20, 2015 at 3:57 PM, Adam Wolf > <[email protected] <mailto:[email protected]>> > wrote: > > :) > > Wonderful! > > I've been discussing this with the devs on IRC--I'm scheming a way > for me to make this "test this patch on the build server" much > faster for everyone. > > Adam Wolf > > On Sun, Dec 20, 2015 at 3:51 PM, Wayne Stambaugh > <[email protected] <mailto:[email protected]>> wrote: > > I just want make sure I don't interrupt the nightly builds. > > On 12/20/2015 2:55 PM, Adam Wolf wrote: > > I switched the nightlies over to SKIP_BOOST a week or two ago in > > preparation for this. I will test this patch but I suspect we are > fine. > > > > Adam Wolf > > > > On Sun, Dec 20, 2015 at 1:29 PM, Wayne Stambaugh > <[email protected] <mailto:[email protected]> > > <mailto:[email protected] <mailto:[email protected]>>> wrote: > > > > Attached is a patch for removing the Boost build from Kicad's > build > > configuration. Would one of our osx devs please test it to > make sure it > > doesn't break anything before I commit it. I also modified > FindCairo to > > work properly with CMakes FindPackageHandleStandardArgs. > > > > I also notice that FindOpenGL does not specify a minimum > version. Would > > one of our GAL devs please let me know what the minimum version > of > > OpenGL is required to build KiCad. > > > > Thanks, > > > > Wayne > > > > _______________________________________________ > > Mailing list: https://launchpad.net/~kicad-developers > > Post to : [email protected] > <mailto:[email protected]> > > <mailto:[email protected] > <mailto:[email protected]>> > > Unsubscribe : https://launchpad.net/~kicad-developers > > More help : https://help.launchpad.net/ListHelp > > > > > > > _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
