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

[py]qtwebengine: meta.platforms; use in qutebrowser, calibre #170196

Merged
merged 4 commits into from May 1, 2022
Merged

[py]qtwebengine: meta.platforms; use in qutebrowser, calibre #170196

merged 4 commits into from May 1, 2022

Conversation

ghost
Copy link

@ghost ghost commented Apr 25, 2022

Description of changes

This four-patch series does the following:

  1. qtwebengine: implement meta.platforms correctly, based on the current state as of qtwebengine 5.15.8. Previously, meta.platforms was simply set to platforms.unix, which is certainly not correct. In particular, powerpc64le is not supported right now (but see below)

  2. pyqtwebengine: do not claim enablement for a platform which is unsupported by qtwebengine.

  3. qutebrowser: do not claim enablement on platforms where the underlying backend (pyqtwebkit or pyqtwebengine) is not enabled. This is straightforward; if the chosen backend does not work then qutebrowser cannot do much.

  4. calibre: on platforms where qtwebengine is not enabled, simply omit qtwebengine rather than failing the build. Most of calibre's functionality does not require a web browser, so disabling calibre simply because qtwebengine is unavailable is overaggressive.

As of this moment qtwebengine is not supported on powerpc64le. However that is likely to change soon; the upstream chromium has a full javascript JIT for powerpc64le (which is already used in nodejs on powerpc64le), and gentoo is shipping a usable qtwebengine on ppc64:

https://packages.gentoo.org/packages/dev-qt/qtwebengine

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • powerpc64le-linux
    • x86_64-darwin
    • aarch64-darwin
  • 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/)
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from AndersonTorres April 26, 2022 12:39
@ghost ghost requested a review from AndersonTorres April 27, 2022 01:47
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

Everything is OK. Now rebase/squash the commits, cleaning them up (no need for those meta-comments).

@ghost
Copy link
Author

ghost commented May 1, 2022

Squashed back to four commits. Let me know if you'd like it all squashed to a single commit.

@ghost ghost requested a review from AndersonTorres May 1, 2022 00:14
Copy link
Member

@AndersonTorres AndersonTorres left a comment

Choose a reason for hiding this comment

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

LGTM, LGTBorg.

@AndersonTorres AndersonTorres merged commit e887de8 into NixOS:master May 1, 2022
@ghost ghost deleted the qtwebengine-fix-platforms branch January 23, 2024 06:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants