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

dev-python/PyQt6 + sip / webengine + qutebrowser test addition #253

Closed
wants to merge 7 commits into from
Closed

dev-python/PyQt6 + sip / webengine + qutebrowser test addition #253

wants to merge 7 commits into from

Conversation

ionenwks
Copy link
Contributor

@ionenwks ionenwks commented Apr 19, 2022

Thought it would be good to push here given there could be others waiting after PyQt6, also gives a qt6 webengine browser 👀. Temporary until qt6 is in the main tree.

I largely intend to maintain PyQt6 stuff myself at this point (if no objections) so I shaped them as I like it, but opinions welcome given I left qt@ after myself in the metadata and haven't kept up with plans.

Haven't been tested that much yet but should generally be okay.

Edit:
wrt naming of these packages, it's intended to match pypi's (aka no MY_PN/MY_P needed), which is generally preferred for dev-python/ -- albeit I admit it's ugly looking with pyqt

qutebrowser upstream also shown recent interest in "maybe" using PySide6, so not entirely sure where PyQt6 will go in this.. but I'll see to it if we get there

Changelog:

  • fixed gles2-only
  • migrate PyQt6{,_WebEngine} to the new sip PEP517 backend
  • sync qmake-utils with ::gentoo for qmake args
  • dropped unused toolchain-funcs in PyQt6{,_WebEngine} (forgot to cleanup after previous)

@ionenwks ionenwks requested review from Chiitoo and Pesa April 19, 2022 14:22
@Chiitoo
Copy link
Contributor

Chiitoo commented Apr 20, 2022

Reminds me I should look into the Otter browser Qt6 port again (I got it functional, if a bit crashy due to some code being just commented out...).

Falkon needed more on the build-system side, so I didn't work on that yet...

Got nothing against this, but as mentioned in IRC, I don't really know anything about PyQt, so can't really comment on that specifically.

Will try to test these out at some point, but don't wait for me on that...

@ionenwks
Copy link
Contributor Author

added fix for gles2-only

@mgorny
Copy link
Member

mgorny commented May 5, 2022

Please put that on hold for a short while, I'd like to add sipbuild.api support to distutils-r1 and then we could use pep517 mode for these.

@mgorny
Copy link
Member

mgorny commented May 5, 2022

Please put that on hold for a short while, I'd like to add sipbuild.api support to distutils-r1 and then we could use pep517 mode for these.

Nevermind that. sipbuild is such a piece of shit I'm not going to work on it. Please let me know if they ever manage to respect CXX, CXXFLAGS, pass job count or do anything useful.

@ionenwks
Copy link
Contributor Author

^ well it's happening after all thanks to sipbuild changes, will update this PR to use PEP517 for PyQt6 and PyQt6_WebEngine after gentoo/gentoo#25383 is merged

@Pesa
Copy link
Contributor

Pesa commented May 11, 2022

@ionenwks what's with the _ in PN? why not use a hyphen like upstream does?

@ionenwks
Copy link
Contributor Author

ionenwks commented May 11, 2022

@ionenwks what's with the _ in PN? why not use a hyphen like upstream does?

To quote my edit from first post:

Edit: wrt naming of these packages, it's intended to match pypi's (aka no MY_PN/MY_P needed), which is generally preferred for dev-python/ -- albeit I admit it's ugly looking with pyqt

Aka, this is exactly what both SRC_URI and S are using (edit: same as e.g. dev-python/sphinx_rtd_theme, if really don't want that I'm not entirely against changing it though, but well)

@ionenwks
Copy link
Contributor Author

^ well it's happening after all thanks to sipbuild changes, will update this PR to use PEP517 for PyQt6 and PyQt6_WebEngine after gentoo/gentoo#25383 is merged

Done, should be ready, hopefully didn't overlook anything while migrating.

inherit distutils-r1

DESCRIPTION="sip module support for PyQt6"
HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
Copy link
Member

Choose a reason for hiding this comment

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

Please add the pypi project to HOMEPAGE, and the source repo if you have it too, e.g.:

HOMEPAGE="
    https://frobnicate.org/
    https://github.com/whatever/frobnicate/
    https://pypi.org/project/frobnicate/
"

It makes it much easier to quickly locate stuff.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tend not to like that because it's redunant on p.g.o. which already shows pypi/github from metadata.xml

src_prepare() {
default

# qmake needs real g++ (not clang), but at least respect ${CHOST} #726112
Copy link
Member

Choose a reason for hiding this comment

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

I wonder if we should put this logic into one of the eclasses.

Copy link
Contributor Author

@ionenwks ionenwks May 11, 2022

Choose a reason for hiding this comment

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

Yeah, it's silly but it'd do away with the -native-symlinks issues. I always test with -native myself so it kinda annoy me on my own packages and wanted to include it. Technically need to be bdepend on gcc for clang profiles too (I did try a wrapper with tc-getCXX but it barfs at clang's output). Not that I looked at exactly what qmake is doing with these direct g++ calls.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Test version with very experimental qt6 support, just to hang
in ::qt for testing and until qt6 is in ::gentoo

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
@ionenwks
Copy link
Contributor Author

Given there's talk to bring Qt6 to ::gentoo soon'ish, I'll probably just merge that there directly later instead.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants