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
add py3.8 patches from pyside 5.14 #62
Conversation
Hi! This is the friendly automated conda-forge-linting service. I just wanted to let you know that I linted all conda-recipes in your PR ( |
Nice, I tried with 5.12.x but the patches did not apply. |
I used these two commits:
And added these changes to make the compilation work again:
|
|
||
build: | ||
number: 6 | ||
number: 7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you are still patching up 5.13.1, do you want to patch up 5.12.6?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't tried to do so. I used the last available build (pyside2 5.13.1) as it was working nicely for me.
@hmaarrfk we used pyside2 5.13 with qt5.12 for a while without too much trouble. So I thought this combination is fine. Are there any known issues of pyside2 5.13 + qt5.12? |
its just not so supported, see discussion in #61 Not sure what version your patches were targetting. |
@hmaarrfk While pyside2 5.13 might not be supported to work with qt 5.12 (officially) I didn't see any bigger issues with this combination. I also saw this combination used in other distros, so I think we should stick to pyside5.13 for now and switch back once issues are reported. |
// PYSIDE-939: This is a temporary patch that circumvents the problem | ||
// with Py_TPFLAGS_METHOD_DESCRIPTOR until this is finally solved. | ||
PyObject *ob_PyType_Type = reinterpret_cast<PyObject *>(&PyType_Type); | ||
- static PyObject *mro = PyObject_GetAttr(ob_PyType_Type, Shiboken::PyName::mro()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure where the static keyword is comming from. It seems to me that it isn't in the 5.13.1 or 5.13.2 source
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OHHHHHHHHHHHHH. You need to flip 0003 and 0004.
you seem to have accidentally deleted the patches. |
This reverts commit 4e6d9a7.
hmm, didn't know i had rights to your branch. lets see what happens. |
Nice thanks for doing this. Should all versions of python be patched with this? |
Patches can be applied for all versions, no need for selectors. |
@@ -3,6 +3,7 @@ | |||
XVFB_RUN="" | |||
if test `uname` = "Linux" | |||
then | |||
cp -r /usr/include/xcb ${PREFIX}/include/qt |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does this do?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is a work-around as pyside messes up system includes and does not find xcb headers installed in the prefix
recipe/meta.yaml
Outdated
# pyside2 5.13.1 needs a few backports from 5.14 to work with python3.8 | ||
- 0002-Fix-Python-3.8-problems.patch # [py >= 38] | ||
- 0003-Optimize-the-Python-3.8-refcount-fix-a-tiny-bit.patch # [py >= 38] | ||
- 0004-make-compilation-work-after-backporting.patch # [py >= 38] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Patches can be applied for all versions, no need for selectors.
Checklist
0
(if the version changed)conda-smithy
(Use the phrase@conda-forge-admin, please rerender
in a comment in this PR for automated rerendering)