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

[20.03] qt5.qtbase: backport cmake macro fix #80963

Closed
wants to merge 1 commit into from
Closed

[20.03] qt5.qtbase: backport cmake macro fix #80963

wants to merge 1 commit into from

Conversation

mmilata
Copy link
Member

@mmilata mmilata commented Feb 24, 2020

Backport #80579 to 20.03. cc @NixOS/nixos-release-managers

Backport fix of QT5_MAKE_OUTPUT_FILE CMake macro which causes FreeCAD build failure when building with qt-5.12.7: https://hydra.nixos.org/build/113081790

It's possible use local copy of the macro in the FreeCAD package instead but I figured this might unbreak some other builds. Not sure if the high number of rebuilds is worth it - let me know what you think.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mmilata
qt5.qtbase: backport cmake macro fix
4c01020 
Backport fix of QT5_MAKE_OUTPUT_FILE CMake macro which causes FreeCAD
build failure when building with qt-5.12.7.

https://bugreports.qt.io/browse/QTBUG-81715

(cherry picked from commit 80650ae)
@veprbl veprbl added this to Needs review in Staging (stable) Feb 24, 2020
@vcunat vcunat self-assigned this Mar 2, 2020
vcunat
vcunat approved these changes Mar 2, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A conservative bugfix. I confirm it fixes freecad build on 20.03 (at least).

Staging (stable) automation moved this from Needs review to Ready Mar 2, 2020
@vcunat
Copy link
Member

vcunat commented Mar 2, 2020 •
edited

Oh, pushed as rebased by accident in 56b1c39. I forgot to set up rebasing merges in this branch no, that seems correct... I don't know what went wrong :-/

@vcunat vcunat closed this Mar 2, 2020
Staging (stable) automation moved this from Ready to Done Mar 2, 2020
@mmilata mmilata deleted the qt-cmake-fix-20.03 branch March 2, 2020 18:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees

@vcunat vcunat

Labels
6.topic: qt/kde 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
Staging (stable)
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mmilata @vcunat