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

qt5.qtwebkit: fix build with bison-3.7 #96309

Merged
merged 1 commit into from Aug 27, 2020
Merged

qt5.qtwebkit: fix build with bison-3.7 #96309

merged 1 commit into from Aug 27, 2020

Conversation

B4dM4n
Copy link
Contributor

@B4dM4n B4dM4n commented Aug 25, 2020

Motivation for this change

Followup of #96295 to fix the qtwebkit builds for Qt 5.12 and 5.14, broken by the bison update to 3.7 (#94562).

Related Debian issue.

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.

@B4dM4n B4dM4n requested a review from ttuegel as a code owner August 25, 2020 20:44
lsix
lsix approved these changes Aug 26, 2020
View reviewed changes
Copy link
Member

@lsix lsix left a comment

Choose a reason for hiding this comment

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

I came up with almost the same resolution.

Maybe we can fetch the patch straight from upstream (https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch), but this changes absolutely nothing (the sha256 sum is the same).

I built qgis on top of the fixed qtwebkit, everything fine for me (I did not dare running all nix-review on this one… qgis was long enough).

@B4dM4n
Copy link
Contributor Author

B4dM4n commented Aug 27, 2020

Maybe we can fetch the patch straight from upstream (https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch), but this changes absolutely nothing (the sha256 sum is the same).

Good idea. Using the upstream URL is cleaner that fetching it from a secondary source.

I also checked that the hash stays the same.

@ttuegel ttuegel merged commit 0ea5d37 into NixOS:master Aug 27, 2020
@ttuegel
Copy link
Member

ttuegel commented Aug 27, 2020

Thanks! 😃

@B4dM4n B4dM4n deleted the qtwebkit-bison-37 branch August 27, 2020 15:57
@jnetod
Copy link
Contributor

jnetod commented Oct 29, 2020 •
edited

this fix could be applied to 5.15 too.

it will un-break qtwebkit and, consequently, qt5.full.

@jnetod jnetod mentioned this pull request Nov 12, 2020
Merged
10 tasks
doronbehar added a commit to doronbehar/nixpkgs that referenced this pull request Nov 21, 2020
@doronbehar
qt515.qtwebkit: unbreak 🎉
983465f 
A copy of NixOS#96309 essentially - fix the build of it with bison-3.7.
@doronbehar doronbehar mentioned this pull request Nov 21, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel ttuegel approved these changes

@lsix lsix lsix approved these changes

Assignees
No one assigned
Labels
6.topic: qt/kde 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@B4dM4n @ttuegel @jnetod @lsix