Skip to content

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

Merged
AndersonTorres merged 4 commits intomasterfrom
unknown repository
May 1, 2022
Merged

[py]qtwebengine: meta.platforms; use in qutebrowser, calibre#170196
AndersonTorres merged 4 commits intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@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.

@ghost ghost requested review from FRidh, jonringer and ttuegel as code owners April 25, 2022 05:26
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation labels Apr 25, 2022
@ofborg ofborg bot requested review from AndersonTorres and pSub April 25, 2022 05:59
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Apr 25, 2022
@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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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

Labels

6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants