kicad-developers team mailing list archive
-
kicad-developers team
-
Mailing list archive
-
Message #26275
Re: [PATCH] Patch consistency & OS X documentation error
> On 16 Sep 2016, at 22:34, Wayne Stambaugh <stambaughw@xxxxxxxxx> wrote:
>
> On 9/16/2016 1:07 PM, Bernhard Stegmaier wrote:
>> Question for me is if we shouldn’t just fork wxWidgets on github and
>> maintain a separate kicad branch there (I started this already for myself).
>> Would get rid of all the nasty patching and everybody willing to build
>> on his own could use this as a single source…
>
> This might make sense for the package devs but how would devs building
> from source know where to look for the "official" wxWidgets source.
By just putting a link to “KiCad official” wxWidgets repo (TBD) into the compilation
instructions for OSX?
> This may be confusing. I really don't know if there is a good way to
> handle this. It would be nice if wxWidgets would accept the patches and
> roll out a 3.0.3 release so we don't have to maintain them ourselves but
> I guess that is asking too much.
I gave up on this one...
>
>>
>>
>> Regards,
>> Bernhard
>>
>>> On 16 Sep 2016, at 17:14, Adam Wolf <adamwolf@xxxxxxxxxxxxxxxxxxxx
>>> <mailto:adamwolf@xxxxxxxxxxxxxxxxxxxx>> wrote:
>>>
>>> Sorry, I used the wrong email address before and my email didn't go
>>> through.
>>>
>>> I think this is correct, and I would like all the patches to be in the
>>> same format. Nick and Simon and I are working on revamping the OS X
>>> packaging scripts so that we get signing and a bunch of improvements
>>> from the last year, and we can handle any changes made here, during
>>> this revamp, so there's no extra burden on the packaging side for this.
>>>
>>> Please note we have moved to 10.9 as a min OS X version, so anything
>>> only needed for 10.7 and 10.8 should be removed.
>>>
>>> Adam Wolf
>>>
>>>
>>> On Fri, Sep 16, 2016 at 10:01 AM, Wayne Stambaugh
>>> <stambaughw@xxxxxxxxx <mailto:stambaughw@xxxxxxxxx>> wrote:
>>>
>>> Would one of our osx devs please comment on this? I don't know if
>>> this
>>> patch makes sense. I'll fix the path issue in compiling.md
>>> <http://compiling.md/>.
>>>
>>> @Collin, please format your patches using git format-patch. It makes
>>> life easier for devs to commit your patches.
>>>
>>> On 9/15/2016 6:21 AM, Collin Anderson wrote:
>>>> Hi, this is more of a tiny proposal in patch form, and a trivial
>>> one so if there is reason to reject it that I haven't thought of
>>> (or its just not wanted) please do so!
>>>>
>>>>
>>>> The current wxwidgets patches in the <kicad-source-tree>/patches
>>> directory use inconsistent formatting. The majority use "===
>>> modified fie '...' " headers for each file, but some of the more
>>> recent ones use the command run as the header, but this causes
>>> problems if you try to combine the patches. Anyone making build
>>> scripts or just wants to save time by using cat to merge the
>>> patches into one file, or simply pipe the output directly to patch
>>> will be unable to do so, and they'll have to manually run patch
>>> for each patchfile with the 'diff' headers. It just seems
>>> needlessly inconsistent. Altering the headers to all use "===
>>> modified file" headers will not break anyone's scripts etc., as
>>> far as I know.
>>>>
>>>> Also, one of the patches,
>>> wxwidgets-3.0.2_macosx_data_view_ctrl.patch, won't even patch
>>> correctly using -p0, it is set up so it requires -p1.
>>>>
>>>> All this patch does is make the patch headers consistent and
>>> patch paths all have consistent --strip (-p) levels, that of 0.
>>>>
>>>> That is all included in patch_patch.patch
>>>>
>>>> Oh, and on a related note, I noticed the path has gotten mangled
>>> in the compling.md <http://compling.md/> documentation:
>>>>
>>>>> Download the wxPython source and build using the following
>>> commands:
>>>>>
>>>>> cd path-to-wxwidgets-src
>>>>> patch -p0 <
>>> path-to-kicad-src/patches/wxwidgets-3.0.0_macosx.patch
>>>>> patch -p0 <
>>> path-to-kicad-src/wxwidgets-3.0.0_macosx_bug_15908.patch
>>> <----------- /path/ missing from path here
>>>>> patch -p0 <
>>> path-to-kicad-src/patches/wxwidgets-3.0.0_macosx_soname.patch
>>>>> patch -p0 <
>>> path-to-kicad-src/patches/wxwidgets-3.0.2_macosx_yosemite.patch
>>>>> patch -p0 <
>>> path-to-kicad-src/patches/wxwidgets-3.0.0_macosx_scrolledwindow.patch
>>>>> mkdir build
>>>>>
>>>>
>>>>
>>>> Also, I wanted to confirm, are these the only patches that
>>> should be applied? For 10.7, I think it is correct.
>>>>
>>>> Maybe we could add something explicitly saying what the other
>>> wxwidgets patches are for (or rather, when they are to be used).
>>> The yosemite one is obvious, magnify event is for El Capitan, not
>>> sure about the retina patch or dataview patch. I think we should
>>> mention them in the documentation though, rather than expecting
>>> someone trying to build kicad to discover them on their own.
>>>>
>>>> Anyway, I know this is about as trivial a matter as can be, so
>>> sorry if anyone feels this is a waste of time. Figured I might as
>>> well though.
>>>> Thanks!
>>>>
>>>>
>>>>
>>>>
>>>>
>>>>
>>>> _______________________________________________
>>>> 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
>>> Post to : kicad-developers@xxxxxxxxxxxxxxxxxxx
>>> <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
>>> Unsubscribe : https://launchpad.net/~kicad-developers
>>> More help : https://help.launchpad.net/ListHelp
>>
>
References