← Back to team overview

kicad-developers team mailing list archive

Re: Patches consistency

 

Who are the Mac developers with committer status?  Can one of them get this wxWidgets branch setup?

(I can help with testing, but I think someone will probably barf if I upload a patch containing the whole source tree. ;)

Cheers,
Jeff.

> On 1 Jan 2018, at 02:03, Simon Wells <swel024@xxxxxxxxx> wrote:
> 
> ah found the issue, build wx with “—disable-mediactrl” as its incompatible with macOS >= 10.12
> 
> 
>> On 1/01/2018, at 12:26 PM, Anton Shevchenko <inbox@xxxxxxxxxxxx <mailto:inbox@xxxxxxxxxxxx>> wrote:
>> 
>> There were 3 issues while running patch utility on all files in patches subfolder.
>> 
>> 1. regarding wxwidgets-3.0.2_macosx_unicode_pasteboard.patch
>> The patch could not be applied for the simple reason there was no "#if 0" lines in the source code of wxwidgets-3.0.2 (downloaded from sourceforge.net <http://sourceforge.net/>).
>> 
>> 2. regarding wxwidgets-3.0.2_macosx_sierra.patch
>> This patch contains CR/LF (ie, Windows style) line endings.
>> 
>> 3. regarding wxwidgets-3.0.0_macosx.patch
>> While applying this patch to 3.0.2 source code the patch utility complained about offsets. That's ok since source code could have changed between 3.0.0 and 3.0.2.
>> 
>> I thought first is critical and the other 2 are not critical as patch utility can fix these problems.
>> You may have got no issues since script in documentation doesn't care about error codes returned from patch utility.
>> 
>> I have fixed all of the issues above but not sure if I should submit them (along with documentation fix on how to build on macOS). If anyone is up for including wxwidgets into kicad's repo I would step aside. If not, I can submit the patch for building wxWidgets 3.0.2 version with patches included on macOS.
>> 
>> --
>>   Sincerely,
>>   Anton Shevchenko
>>   inbox@xxxxxxxxxxxx <mailto:inbox@xxxxxxxxxxxx>
>> 
>> 
>> On Sun, Dec 31, 2017, at 1:55 PM, Simon Wells wrote:
>>> whats the error when you try applying it on 3.0.2 i don’t think i have any issues? (jsut fyi i did a build last night with it being patched without issues)
>>> 
>>> Simon
>>> 
>>>> On 1/01/2018, at 5:22 AM, Anton Shevchenko <inbox@xxxxxxxxxxxx <mailto:inbox@xxxxxxxxxxxx>> wrote:
>>>> 
>>>> Thanks Jess for pointing this. My mistake.
>>>> I meant the wxwidgets-3.0.2_macosx_unicode_pasteboard.patch could not be applied.
>>>> Neither on top of 3.0.2 nor on top of 3.0.3.
>>>> 
>>>> --
>>>>   Sincerely,
>>>>   Anton Shevchenko
>>>>   inbox@xxxxxxxxxxxx <mailto:inbox@xxxxxxxxxxxx>
>>>> 
>>>> 
>>>> On Sat, Dec 30, 2017, at 3:42 AM, Jeff Young wrote:
>>>>> Hi Anton,
>>>>> 
>>>>> The staticbox_tabbing patch is one of the git patches.  Use:
>>>>> 
>>>>> git apply path-to-kicad-src/patches/wxwidgets-3.0.0_macosx_staticbox_tabbing.patch
>>>>> 
>>>>> to apply it.
>>>>> 
>>>>> Cheers,
>>>>> Jeff.
>>>>> 
>>>>> 
>>>>> 
>>>>>> On 30 Dec 2017, at 01:42, Simon Wells <swel024@xxxxxxxxx <mailto:swel024@xxxxxxxxx>> wrote:
>>>>>> 
>>>>>> you don’t have to get a < 10.11 SDK you can just remove the include and all works iirc, there is a patch floating around for that as well
>>>>>> 
>>>>>>> On 30/12/2017, at 2:25 PM, Anton Shevchenko <inbox@xxxxxxxxxxxx <mailto:inbox@xxxxxxxxxxxx>> wrote:
>>>>>>> 
>>>>>>> I have completed the quest of compiling wxWidgets with kicad patches.
>>>>>>> Here are my notes.
>>>>>>> 
>>>>>>> First, as noted before, not all patches were included in script in documentation.
>>>>>>> 
>>>>>>> Second, the file wxwidgets-3.0.0_macosx_staticbox_tabbing.patch could not be applied to 3.0.2 version. The solution is to delete the file at all.
>>>>>>> 
>>>>>>> Third, on macOS 10.12+ the QTKit framework has been deprecated. To compile it successfully one has to obtain an SDK for 10.11 or lower. I found it is enough to get it from here 
>>>>>>> https://github.com/phracker/MacOSX-SDKs/releases <https://github.com/phracker/MacOSX-SDKs/releases>
>>>>>>> and add this option
>>>>>>> 
>>>>>>> ../configure \
>>>>>>> [skip]
>>>>>>>    --with-macosx-sdk=$MACOS_SDK_PATH \
>>>>>>> [skip]
>>>>>>> 
>>>>>>> 
>>>>>>> --
>>>>>>>   Sincerely,
>>>>>>>   Anton Shevchenko
>>>>>>>   inbox@xxxxxxxxxxxx <mailto:inbox@xxxxxxxxxxxx>
>>>>>>> 
>>>>>>> 
>>>>>>> On Fri, Dec 29, 2017, at 4:23 PM, Jeff Young wrote:
>>>>>>>> Having a single place I could do a simple git clone (as opposed to applying patches) would be the biggest win.  I don’t think it matters that much where the single place is.
>>>>>>>> 
>>>>>>>> If there are no legal/etc. issues then the kicad org would be best.  But even if it has to be in the wxWidgets org, that would be better than what we have now.
>>>>>>>> 
>>>>>>>> Cheers,
>>>>>>>> Jeff.
>>>>>>>> 
>>>>>>>> 
>>>>>>>> 
>>>>>>>>> On 30 Dec 2017, at 00:14, Adam Wolf <adamwolf@xxxxxxxxxxxxxxxxxxxx <mailto:adamwolf@xxxxxxxxxxxxxxxxxxxx>> wrote:
>>>>>>>>> 
>>>>>>>>> Sounds fine to me!
>>>>>>>>> 
>>>>>>>>> Adam
>>>>>>>>> 
>>>>>>>>> On Dec 29, 2017 5:45 PM, "Nick Østergaard" <oe.nick@xxxxxxxxx <mailto:oe.nick@xxxxxxxxx>> wrote:
>>>>>>>>> We could have a fork of wx in the kicad org with a branch where we rebase the patches to. Then it is easy to fetch for others. The osx devs could maintain this. But having it in the kicad org gives more visibility and we don't need to habe them directly in the kicad source. 
>>>>>>>>> 
>>>>>>>>> This is just an idea, this proposal might need some more thought.
>>>>>>>>> 
>>>>>>>>> Den 29. dec. 2017 23.36 skrev "Wayne Stambaugh" <stambaughw@xxxxxxxxx <mailto:stambaughw@xxxxxxxxx>>:
>>>>>>>>> This seems like a reasonable solution.  Although pointing macOS
>>>>>>>>> developers to the repo might be an issue.
>>>>>>>>> 
>>>>>>>>> On a related note, I was just updating the compiling.md <http://compiling.md/> file and noticed
>>>>>>>>> that there seem to be quite a few of the macos wxWidgets patches not
>>>>>>>>> mentioned in the "Building KiCad on macOS" section.  I'm guessing this
>>>>>>>>> needs to be updated.
>>>>>>>>> 
>>>>>>>>> On 12/29/2017 05:27 PM, Bernhard Stegmaier wrote:
>>>>>>>>> > To be honest, I don’t like the patches as is at all.
>>>>>>>>> > You never know if patches are still need if there are new versions or if they still do apply.
>>>>>>>>> >
>>>>>>>>> > IMHO it would be a better solution if someone would maintain a fork of wxwidgets (e.g., on GitHub) with all the needed patches applied, so that someone who really wants to build just has to sync this… ?
>>>>>>>>> > For myself, I do this quite some time so I don’t have to apply all the patches every time (for wxWidgets master).
>>>>>>>>> >
>>>>>>>>> >
>>>>>>>>> > Regards,
>>>>>>>>> > Bernhard
>>>>>>>>> >
>>>>>>>>> >> On 29. Dec 2017, at 22:07, Adam Wolf <adamwolf@xxxxxxxxxxxxxxxxxxxx <mailto:adamwolf@xxxxxxxxxxxxxxxxxxxx>> wrote:
>>>>>>>>> >>
>>>>>>>>> >> I think the main reason why this happens is that most of those patches
>>>>>>>>> >> are not created by KiCad devs, but rather taken from upstream mailing
>>>>>>>>> >> lists, and I have always just preserved the patch as is, but I don't
>>>>>>>>> >> have a strong opinion on keeping it like it is or changing it to be
>>>>>>>>> >> more consistent.
>>>>>>>>> >>
>>>>>>>>> >> I don't mind how it would get changed, as long as, if it gets changed,
>>>>>>>>> >> it gets more consistent between the different patches and between the
>>>>>>>>> >> patches and the docs.
>>>>>>>>> >>
>>>>>>>>> >> Adam Wolf
>>>>>>>>> >>
>>>>>>>>> >> On Fri, Dec 29, 2017 at 2:37 PM, Wayne Stambaugh <stambaughw@xxxxxxxxx <mailto:stambaughw@xxxxxxxxx>> wrote:
>>>>>>>>> >>> Any of our osx devs have an opinion on this?  It doesn't impact me so I
>>>>>>>>> >>> would rather the devs who have to use this make the call.
>>>>>>>>> >>>
>>>>>>>>> >>> On 12/29/2017 03:33 PM, Anton Shevchenko wrote:
>>>>>>>>> >>>> Hi all,
>>>>>>>>> >>>>
>>>>>>>>> >>>> Looking through the code style guide (i'm new here) I didn't find a word about how a patch file should reference source code file. By patch file I mean *.patch file located in kicad/patches folder.
>>>>>>>>> >>>>
>>>>>>>>> >>>> Being on macOS I'm trying to apply all the patches required for building wxWidgets and have found that there are 2 different styles in use.
>>>>>>>>> >>>> First style references source code files without prefix. To apply such a patch one has to run 'patch -p0'.
>>>>>>>>> >>>> The other style uses a/ and b/ prefixes which is used with 'patch -p1' option.
>>>>>>>>> >>>> In my opinion the last one is more common (and if you run 'git diff' you will see a/ and b/ prefixes).
>>>>>>>>> >>>>
>>>>>>>>> >>>> I would like to fix macOS patches stuff to be able to actually follow the guide (http://docs.kicad-pcb.org/doxygen/md_Documentation_development_compiling.html#build_osx <http://docs.kicad-pcb.org/doxygen/md_Documentation_development_compiling.html#build_osx>) in order to build KiCad for macOS.
>>>>>>>>> >>>>
>>>>>>>>> >>>> Any comments?
>>>>>>>>> >>>>
>>>>>>>>> >>>
>>>>>>>>> >>> _______________________________________________
>>>>>>>>> >>> Mailing list: https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>>>> >>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
>>>>>>>>> >>> Unsubscribe : https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>>>> >>> More help   : https://help.launchpad.net/ListHelp <https://help.launchpad.net/ListHelp>
>>>>>>>>> >>
>>>>>>>>> >> _______________________________________________
>>>>>>>>> >> Mailing list: https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>>>> >> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
>>>>>>>>> >> Unsubscribe : https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>>>> >> More help   : https://help.launchpad.net/ListHelp <https://help.launchpad.net/ListHelp>
>>>>>>>>> >
>>>>>>>>> 
>>>>>>>>> _______________________________________________
>>>>>>>>> Mailing list: https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>>>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
>>>>>>>>> Unsubscribe : https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>>>> More help   : https://help.launchpad.net/ListHelp <https://help.launchpad.net/ListHelp>
>>>>>>>>> _______________________________________________
>>>>>>>>> Mailing list: https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>>>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
>>>>>>>>> Unsubscribe : https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>>>> More help   : https://help.launchpad.net/ListHelp <https://help.launchpad.net/ListHelp>
>>>>>>>> 
>>>>>>>> _______________________________________________
>>>>>>>> Mailing list: https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
>>>>>>>> Unsubscribe : https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>>> More help   : https://help.launchpad.net/ListHelp <https://help.launchpad.net/ListHelp>
>>>>>>> 
>>>>>>> _______________________________________________
>>>>>>> Mailing list: https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
>>>>>>> Unsubscribe : https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>>> More help   : https://help.launchpad.net/ListHelp <https://help.launchpad.net/ListHelp>
>>>>>> 
>>>>>> 
>>>>>> _______________________________________________
>>>>>> Mailing list: https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
>>>>>> Unsubscribe : https://launchpad.net/~kicad-developers <https://launchpad.net/~kicad-developers>
>>>>>> More help   : https://help.launchpad.net/ListHelp <https://help.launchpad.net/ListHelp>


References