Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[wip] wxWidgets: move wxGTK-* to one wxWidgets folder #16192

Closed
wants to merge 9 commits into from
Closed

[wip] wxWidgets: move wxGTK-* to one wxWidgets folder #16192

wants to merge 9 commits into from

Conversation

matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Jun 12, 2016 •
edited by viric

Motivation for this change

wxGTK had a lot of code duplication. This merges wxGTK* and wxmac into one "wxWidgets/default.nix" file.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • OS X
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @LnL7, @viric and @edolstra to be potential reviewers

@matthewbauer matthewbauer changed the title [wip] wxWidgets: move wxGTK-* to one wxWidgets folder wxWidgets: move wxGTK-* to one wxWidgets folder Jun 13, 2016
@matthewbauer
Copy link
Member Author

This is causing a mass rebuild which I think is what is breaking travis.

@matthewbauer
Copy link
Member Author

cc @vcunat Could you stage this at some point? I'm not seeing any issues but lots depends on it.

@vcunat
Copy link
Member

vcunat commented Jul 3, 2016

Skimming all this quickly, it looks OK. I dislike a little that libgd should use some "random" master commit; maybe using that PR would be better as that would reportedly add only two commits to the release.

@vcunat
Copy link
Member

vcunat commented Jul 3, 2016

Or we might directly apply libgd/libgd@502e4cd to the release, perhaps even on darwin only (to avoid depending on the tools elsewhere).

@matthewbauer matthewbauer force-pushed the wxwidgets-refactor branch 2 times, most recently from 629ee88 to 22d4599 Compare July 3, 2016 22:23
@matthewbauer
Copy link
Member Author

Ok, I updated libgd to 2.2.2 and also applied the patch that should fix the issue with building.

@vcunat
Copy link
Member

vcunat commented Jul 9, 2016

Now we should go for gd-2.2.2 at least, due to security: f48d215.

@matthewbauer
Copy link
Member Author

Okay, commit c5ed30f8afb86831066c3cec265873cffd746b4a should be good to go. Everything else should also be good but less urgent.

@matthewbauer matthewbauer changed the title wxWidgets: move wxGTK-* to one wxWidgets folder [wip] wxWidgets: move wxGTK-* to one wxWidgets folder Jul 13, 2016
@matthewbauer matthewbauer changed the title [wip] wxWidgets: move wxGTK-* to one wxWidgets folder wxWidgets: move wxGTK-* to one wxWidgets folder Aug 16, 2016
@matthewbauer
Copy link
Member Author

@vcunat I just rebased onto master. This should be ready for another look.

@matthewbauer matthewbauer force-pushed the wxwidgets-refactor branch 2 times, most recently from 05cab96 to 01106a2 Compare August 16, 2016 18:50
@matthewbauer matthewbauer mentioned this pull request Aug 28, 2016
Closed
@FRidh
Copy link
Member

FRidh commented Sep 1, 2016 •
edited

This seems to break pythonPackages.wxPython.

In file included from /nix/store/a9whppkflv4f6dq40hdw0lqxvs2srbl8-wxwidgets-3.1.0/include/wx/defs.h:20:0,
                 from /nix/store/a9whppkflv4f6dq40hdw0lqxvs2srbl8-wxwidgets-3.1.0/include/wx/wx.h:14,
                 from include/wx/wxPython/wxPython_int.h:35,
                 from src/helpers.cpp:17:
/nix/store/a9whppkflv4f6dq40hdw0lqxvs2srbl8-wxwidgets-3.1.0/include/wx/platform.h:136:22: fatal error: wx/setup.h: No such file or directory
compilation terminated.
error: command 'gcc' failed with exit status 1
builder for ‘/nix/store/53qfpc47b787wnfm2q0l4qgx44gnad1c-python2.7-wxPython-3.0.2.0.drv’ failed with exit code 1
error: build of ‘/nix/store/53qfpc47b787wnfm2q0l4qgx44gnad1c-python2.7-wxPython-3.0.2.0.drv’ failed

@matthewbauer matthewbauer changed the title wxWidgets: move wxGTK-* to one wxWidgets folder [wip] wxWidgets: move wxGTK-* to one wxWidgets folder Sep 4, 2016
@matthewbauer
wxWidgets: move wxGTK-* to one wxWidgets folder
c3e0e9d 
- removes wxmac
- removes wxGTK28, wxGTK29, wxGTK30
- adds "compat28" and "compat30" flags
- add aliases for wxmac, wxGTK28, wxGTK29, wxGTK30
- resolves NixOS#16066
@matthewbauer
Add metadata to wxWidgets.
a2af5d4 
- add in missing metadata
@matthewbauer
Add matthewbauer as a maintainer to wxWidgets.
65fcaea
@matthewbauer
Add in "wxWindows31" license.
2acea4c 
- add wxWindows31 license to licenses.nix
- set wxWidgets to that license
@matthewbauer
wxmaxima: 15.04.0 -> 16.04.2
13fbe4e 
- uses fetchFromGitHub to obtain
@matthewbauer
wxmaxima: apply darwin patch
a2dc24c 
- patch allows “Darwin” builds to work unbundled
@matthewbauer
wxWidgets: add patch for os x 10.10
8b29042 
The new CF framework breaks the only available version of
wxWidgets. This should remove the breaking stuff.
@matthewbauer
wxwidgets: fixup file
71a7a6e
@FRidh FRidh self-assigned this Sep 6, 2016
@matthewbauer matthewbauer mentioned this pull request Apr 23, 2017
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@FRidh FRidh

Labels
2.status: merge conflict
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

wxwidgets fails to build on OSX
5 participants
@matthewbauer @mention-bot @vcunat @FRidh @LnL7