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.

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

virt-manager-qt: Add patch to rename variables #99383

Merged
merged 1 commit into from Oct 10, 2020
Merged

virt-manager-qt: Add patch to rename variables #99383

merged 1 commit into from Oct 10, 2020

Conversation

fadenb
Copy link
Contributor

@fadenb fadenb commented Oct 2, 2020 •
edited

KDE/krdc@56a0222 renamed some
variables resulting in a build failure. The added patch renames the
variables in virt-manager-qt accordingly.

Motivation for this change

Fix broken build
ZHF: #97479

Things done
  • Manually tested by accessing a VM using VNC instead of spice
  • 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.

virt-manager-qt: Add patch to rename variables
643bdb4 
KDE/krdc@56a0222 renamed some
variables resulting in a build failure. The added patch renames the
variables in virt-manager-qt accordingly.
@fadenb fadenb marked this pull request as ready for review October 2, 2020 12:28
@fadenb
Copy link
Contributor Author

fadenb commented Oct 2, 2020

@GrahamcOfBorg build virt-manager-qt

@fadenb fadenb requested a review from peterhoeg October 2, 2020 12:39
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/326

@fadenb
Copy link
Contributor Author

fadenb commented Oct 9, 2020

/marvin opt-in
/status needs_reviewer

@marvin-mk2
Copy link

marvin-mk2 bot commented Oct 9, 2020

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@risicle risicle mentioned this pull request Oct 10, 2020
Closed
@Ma27 Ma27 merged commit 1b05fcc into NixOS:master Oct 10, 2020
@Ma27
Copy link
Member

Ma27 commented Oct 10, 2020

@fadenb will backport to 20.09. Btw would it make sense to file a PR against upstream with your patch? :)

@Ma27
Copy link
Member

Ma27 commented Oct 10, 2020

Hmm, I cherry-picked this onto my local release-20.09 (/nix/store/q7hfcvk4wjhzv8s885brl98nq43vfr5x-virt-manager-qt-0.71.95) and qt-virt-manager breaks then with the following error:

./result/bin/qt5-virt-manager: symbol lookup error: /nix/store/w70ys9lv4j2h6f3di1jhqyxav8059ywv-qtbase-5.12.7/lib/libQt5DBus.so.5: undefined symbol: _ZN14QMetaCallEventC2EttPFvP7QObjectN11QMetaObject4CallEiPPvEPKS0_iiPiS5_P10QSemaphore, version Qt_5_PRIVATE_API

@fadenb
Copy link
Contributor Author

fadenb commented Oct 10, 2020

Hmm, I cherry-picked this onto my local release-20.09 (/nix/store/q7hfcvk4wjhzv8s885brl98nq43vfr5x-virt-manager-qt-0.71.95) and qt-virt-manager breaks then with the following error:

./result/bin/qt5-virt-manager: symbol lookup error: /nix/store/w70ys9lv4j2h6f3di1jhqyxav8059ywv-qtbase-5.12.7/lib/libQt5DBus.so.5: undefined symbol: _ZN14QMetaCallEventC2EttPFvP7QObjectN11QMetaObject4CallEiPPvEPKS0_iiPiS5_P10QSemaphore, version Qt_5_PRIVATE_API

Interesting. Will check that out.
Regarding upstream PR: yep, as soon as I find the time ;)

@fadenb
Copy link
Contributor Author

fadenb commented Oct 10, 2020

I can confirm the issue when cherry-picking the change on top of the current release-20.09.
The change seems to work fine on master (at least when using the build output from master on my 20.03 system).

I will try to track down the difference in 20.09 and master but that might take me a while.

@fadenb fadenb deleted the virt-manager-qt_fix branch October 10, 2020 19:48
@fadenb
Copy link
Contributor Author

fadenb commented Oct 11, 2020

I bisected release-20.09 with the commit cherry-picked on top until arrived at ce4eb0b

ce4eb0b79b3b8e830d40345fb6457fac6ca9a9ec is the first bad commit
commit ce4eb0b79b3b8e830d40345fb6457fac6ca9a9ec
Author: Thomas Tuegel <ttuegel@mailbox.org>
Date:   Mon Sep 7 20:54:54 2020 -0500

    plasma5: pin to qt512

 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 approved these changes

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 awaiting_reviewer marvin
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@fadenb @nixos-discourse @Ma27