Discussion:
[Audacity-devel] Updating wxWidgets fork
Darrell Walisser
2017-02-13 19:36:23 UTC
Permalink
I just started a new PR to update this and get all patches added (from mac/
and windows/)

To start things off, I have merged from mainline the branch "WX_3_0_BRANCH"
since (I presume) the 3.0.x version is the only one we're interested in. I
also think we should delete all of the other branches and rename this to
"master" to make it cleaner.

If the approach is agreeable I will add our patches to this PR as well.
James Crook
2017-02-13 20:39:24 UTC
Permalink
Woah!

I see zillions of commits. We don't want a heavily patched private
branch of wx3.0.2. Are these changes all necessary for OpenMP? If not
what is the rationale for adding them?

We have our patches to 3.0.2 on
https://github.com/audacity/wxWidgets/commits/audacity-fixes
With some partial explanations in the wiki....
http://wiki.audacityteam.org/wiki/For_Upstream_wxWidgets

Ideally we will clean this up and get wxWidgets to review and accept our
changes into a future wxWidgets. Then we can upgrade to that version,
and again work with a standard unpatched wxWidgets.

I'm not understanding what the PR with many commits in it is achieving.

--James.
Post by Darrell Walisser
I just started a new PR to update this and get all patches added (from mac/
and windows/)
To start things off, I have merged from mainline the branch "WX_3_0_BRANCH"
since (I presume) the 3.0.x version is the only one we're interested in. I
also think we should delete all of the other branches and rename this to
"master" to make it cleaner.
If the approach is agreeable I will add our patches to this PR as well.
Darrell Walisser
2017-02-13 21:14:03 UTC
Permalink
Post by James Crook
Woah!
I see zillions of commits. We don't want a heavily patched private
branch of wx3.0.2. Are these changes all necessary for OpenMP? If not
what is the rationale for adding them?
​Doh, I did not notice the audacity-fixes branch.... I thought I was doing
something which has apparently already been done. I will have to look at
this branch to see if anything is needed for the cross compile.

What do you think about also rebasing to the current 3.0.3 branch? Or maybe
have a release and development branch. Realistically all the patches are
not going to be accepted, but we can keep rebasing to the current 3.0.x
series to get other bug fixes.

I still think it would be good to nuke all the branches we don't care about.
James Crook
2017-02-13 22:34:44 UTC
Permalink
Post by James Crook
Doh, I did not notice the audacity-fixes branch.... I thought I was doing
something which has apparently already been done. I will have to look at
this branch to see if anything is needed for the cross compile.
What do you think about also rebasing to the current 3.0.3 branch?
Our experience to date has been that updating to new versions of
wxWidgets just creates new problems. We have been reluctant to do so
unless we have strong reasons to. If we gain something tangible from
rebasing off 3.0.3 then it could be worth doing. What bug fixes that
actually affect us do we gain from? GTK window resizing bug fixes? At
the moment I'd rather the bugs we know than new ones.
Post by James Crook
Or maybe have a release and development branch. Realistically all the patches are
not going to be accepted, but we can keep rebasing to the current 3.0.x
series to get other bug fixes.
I can see a case for having a new wxWidgets branch for fixes needed for
OpenMP. I don't see a case for having a development branch that tracks
latest work by wxWidgets team on wxWidgets. We want to be using stable
released software from them.
Post by James Crook
I still think it would be good to nuke all the branches we don't care about.
I've trimmed it down a lot.

--James.
Darrell Walisser
2017-02-14 21:19:08 UTC
Permalink
Post by James Crook
Post by Darrell Walisser
What do you think about also rebasing to the current 3.0.3 branch?
Our experience to date has been that updating to new versions of
wxWidgets just creates new problems. We have been reluctant to do so
unless we have strong reasons to. If we gain something tangible from
rebasing off 3.0.3 then it could be worth doing. What bug fixes that
actually affect us do we gain from? GTK window resizing bug fixes? At
the moment I'd rather the bugs we know than new ones.
​Turns out, 3.0.2 will work fine with some small changes.
https://github.com/audacity/wxWidgets/pull/2

Note the doserrno call is replaced by the more standard errno that doesn't
depend on msvcrt. The error codes are equivalent (ref:
http://www.reactos.org/pipermail/ros-kernel/2003-November/000764.html)
James Crook
2017-02-15 12:00:12 UTC
Permalink
Post by Darrell Walisser
https://github.com/audacity/wxWidgets/pull/2
Thanks Darrell. This looks good, and will almost certainly be accepted
once Audacity 2.1.3 is released.

--James.
Post by Darrell Walisser
Post by James Crook
Post by Darrell Walisser
What do you think about also rebasing to the current 3.0.3 branch?
Our experience to date has been that updating to new versions of
wxWidgets just creates new problems. We have been reluctant to do so
unless we have strong reasons to. If we gain something tangible from
rebasing off 3.0.3 then it could be worth doing. What bug fixes that
actually affect us do we gain from? GTK window resizing bug fixes? At
the moment I'd rather the bugs we know than new ones.
Turns out, 3.0.2 will work fine with some small changes.
https://github.com/audacity/wxWidgets/pull/2
Note the doserrno call is replaced by the more standard errno that doesn't
http://www.reactos.org/pipermail/ros-kernel/2003-November/000764.html)
Loading...