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

protonmail-bridge-gui: patch source to support Qt 6.8 #350283

Conversation

daniel-fahey
Copy link
Contributor

Fixes #350165 (runtime errors encountered when using a version of the GUI built with Qt 6.8). Patches upstream's Qt Modeling Language (QML) files to support Qt 6.8. Proton AG seem unlikely to update upstream to support Qt 6.8 anytime soon.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Oct 21, 2024
@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/4744

@daniel-fahey
Copy link
Contributor Author

Looks like the next release will be patched to support building with Qt 6.8 ProtonMail/proton-bridge#502 (comment)

Copy link
Contributor

@Naxdy Naxdy left a comment

Choose a reason for hiding this comment

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

Given that ProtonMail/proton-bridge#502 seems to have been accepted upstream, I think it makes sense to include the contents of that PR as a patch rather than using the sed approach.

@daniel-fahey daniel-fahey force-pushed the protonmail-bridge-gui-qt68support branch from fb1cac2 to 628943b Compare November 6, 2024 16:33
@daniel-fahey
Copy link
Contributor Author

I've replaced my sed scripts with the Arch patches. For (my own) reference I made the patches using:

git remote add proton https://github.com/ProtonMail/proton-bridge.git
git fetch proton pull/502/head:pr-502
git format-patch master..pr-502 \
  --full-index \
  --stat \
  --summary \
  --cover-from-description=message \
  --base=auto \
  --relative=internal/frontend/bridge-gui/

@daniel-fahey daniel-fahey force-pushed the protonmail-bridge-gui-qt68support branch from 628943b to f78bd97 Compare November 6, 2024 16:38
Copy link
Contributor

@Naxdy Naxdy left a comment

Choose a reason for hiding this comment

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

Package builds & GUI works again 👍

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 6, 2024
@aacebedo
Copy link
Contributor

can we merge this if it works ?

@daniel-fahey
Copy link
Contributor Author

Superseded by #359899

@Phr0stByte
Copy link

All of this is very confusing - is there a nixos 24.11 fix? If so, can we just get the fixed one in the 24.11 channels so we can simply just run an update?

@daniel-fahey
Copy link
Contributor Author

daniel-fahey commented Dec 2, 2024

All of this is very confusing - is there a nixos 24.11 fix? If so, can we just get the fixed one in the 24.11 channels so we can simply just run an update?

The backport was merged into the release-24.11 branch yesterday #360778

It's not yet reached the nixos-24.11 branch as of writing (according to https://nixpk.gs/pr-tracker.html?pr=360778)

@Phr0stByte
Copy link

All of this is very confusing - is there a nixos 24.11 fix? If so, can we just get the fixed one in the 24.11 channels so we can simply just run an update?

The backport was merged into the release-24.11 branch yesterday #360778

It's not yet reached the nixos-24.11 branch as of writing (according to https://nixpk.gs/pr-tracker.html?pr=360778)

Thanks. Using the flatpak which is working for now, until the fix makes the main nixos channels

@daniel-fahey
Copy link
Contributor Author

It's just reached nixos-24.11

@Phr0stByte
Copy link

It's just reached nixos-24.11

Confirmed - and working perfectly! Thanks!!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ProtonMail Bridge 3.14 fails to start on Nixos unstable with Qt 6.8
7 participants