kicad-developers team mailing list archive

[Bernhard Stegmaier <stegmaier@xxxxxxxxxxxxx>]

Hi,

> On 15. Jan 2018, at 10:39, Carsten Schoenert <c.schoenert@xxxxxxxxxxx> wrote:
>> 
>> We should make it obvious that it is a branch of wxwidgets for kicad
>> specifically patched for macos to avoid any confusion.
> based on my experiences in other projects I suggest to use topic and
> prefixed branch names. I'd avoid the usage of capital letters.
> 
> e.g.
> kicad/macos-10
> kicad/macos-11
> kicad/wx-3.0.3

Good proposal, I like that.
So, I created a branch

  kicad/macos-wx-3.0

based on the original WX_3_0_BRANCH.
If at some point patches for other OS (e.g., the mingw patches) should go in, we can still rename it and remove the macOS part.

>> 2) Commits
>> The branch should always be rebased to wxWidgets changes, so all
>> patches will stay at the top.
> Rethink about rebasing to hold the branches in sync with upstream as
> this breaks clones of your branches due smashed SHA IDs and people would
> need to do a hard reset. Just merge any upstream changes as usual into
> your branches, in case you want to address / forward your work to
> upstream you also would do a merge request then. That's the typicall
> workflow I know in such cases.

Thanks for the reminder, I tend to forget that.
So, no rebasing but merging.

>> I still find it somehow difficult to see where original branch ends
>> and own changes start.> Should we add some prefix “KiCad: …” to all commit messages?
> 
> I see no need to do so as you work on "your" branch and merge commits
> are visible as that they are, I personally do some prefixing in my work
> in the subject for the file, component, part, OS (...) the commit is about.

I decided to prefix every change with “macOS: “, just in case the branch gets used for other OS in future.


I reviewed all the patches and only applied what was still needed/valid.
See end of the mail for details.
For me, it compiles on macOS 10.12 and 10.13 (with macosx-version-min from 10.13 down to 10.7).

The branch should be ready to use now.
All macOS devs please test if you see any problems or if anything is missing.

As soon as Adam has integrated it into the daily builds also the current build errors should be gone.

Next step would be to adapt KiCad compile documentation and to remove the patches from KiCad source.
@Wayne: Is it OK for you to remove the patches?


Regards,
Bernhard

=====

Patches applied as in KiCad repository:
  wxwidgets-3.0.0_macosx.patch
  wxwidgets-3.0.0_macosx_bug_15908.patch
  wxwidgets-3.0.0_macosx_staticbox_tabbing.patch
  wxwidgets-3.0.2_macosx_magnify_event.patch
  wxwidgets-3.0.2_macosx_retina_opengl.patch

Applied with changes:
  wxwidgets-3.0.0_macosx_soname.patch
    ==> See wxWidget ticket
  wxwidgets-3.0.2_macosx_data_view_ctrl.patch
    ==> See wxWidget ticket, changed to strip out styles in question
  wxwidgets-3.0.2_macosx_quasimodal.patch
    ==> Corrected version with missing header

No longer needed (already applied or other fix):
  wxwidgets-3.0.0_macosx_scrolledwindow.patch
  wxwidgets-3.0.2_macosx_unicode_pasteboard.patch
  wxwidgets-3.0.2_macosx_high_sierra.patch
  wxwidgets-3.0.2_macosx_sierra.patch
  wxwidgets-3.0.2_macosx_yosemite.patch

Additional patches (not yet in KiCad repository)
  https://bugs.launchpad.net/kicad/+bug/1692352 <https://bugs.launchpad.net/kicad/+bug/1692352>