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

Cura 4.9.1 #21150

Closed
wants to merge 8 commits into from
Closed

Cura 4.9.1 #21150

wants to merge 8 commits into from

Conversation

MathyV
Copy link
Contributor

@MathyV MathyV commented Jun 7, 2021

Version bump (https://bugs.gentoo.org/793803)

This PR also adds python 3.9 to the ebuilds and fixes a potential dependency issue (https://bugs.gentoo.org/731274)

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @MathyV
Areas affected: ebuilds
Packages affected: dev-libs/libarcus, dev-libs/libcharon, dev-libs/libsavitar, dev-python/pynest2d, dev-python/uranium...

dev-libs/libarcus: @gentoo/3dprint, @alexxy, @gentoo/proxy-maint, @MathyV, @Perlovka
dev-libs/libcharon: @gentoo/3dprint, @alexxy, @gentoo/proxy-maint, @MathyV, @Perlovka
dev-libs/libsavitar: @gentoo/3dprint, @alexxy, @gentoo/proxy-maint, @MathyV, @Perlovka
dev-python/pynest2d: @gentoo/3dprint
dev-python/uranium: @gentoo/3dprint, @gentoo/python, @alexxy, @gentoo/proxy-maint, @MathyV, @Perlovka
media-gfx/cura: @gentoo/3dprint, @alexxy, @gentoo/proxy-maint, @MathyV, @Perlovka
media-gfx/curaengine: @gentoo/3dprint, @alexxy, @gentoo/proxy-maint, @MathyV, @Perlovka
media-gfx/fdm-materials: @gentoo/3dprint, @alexxy, @gentoo/proxy-maint, @MathyV, @Perlovka

Linked bugs

Bugs linked: 731274, 793803


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Jun 7, 2021
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2021-06-07 16:24 UTC
Newest commit scanned: a992e04
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/464965947b/output.html

@expeditioneer expeditioneer self-assigned this Jun 7, 2021
@MathyV
Copy link
Contributor Author

MathyV commented Jun 7, 2021

Looks like I jumped the gun a bit and missed a new python dependency keyring, checking if I missed any else

@MathyV
Copy link
Contributor Author

MathyV commented Jun 7, 2021

I added keyring, importlib_metadata and PyQt5-sip since they were added to requirements.txt in Ultimaker/Cura@8bc2c71 I left the other dependencies alone since they only got an update.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2021-06-07 18:39 UTC
Newest commit scanned: ff8f3c1
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/45ab76e71e/output.html

Copy link
Contributor

@expeditioneer expeditioneer left a comment

Choose a reason for hiding this comment

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

Thank you for your contribution. Could you have a look at my review comments?

@@ -0,0 +1,30 @@
--- a/src/Socket_p.h
Copy link
Contributor

Choose a reason for hiding this comment

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

This file has the same content as libarcus-4.8.0-deprecated-protobuf-calls.patch please reference this instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My reasoning was that I expect 4.8.0 to disappear soon because of no Python 3.9 in the ebuilds, yet I didn't want to touch the ebuild contents, but okay, I'll adapt it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@expeditioneer is it okay if I rename the file to be versionless and update 4.8.0 also without a revbump?

Copy link
Contributor

Choose a reason for hiding this comment

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

@MathyV i would like to have the version number when this patch was first introduced so it is IMHO better to keep track when this patch was first introduced. This is not a strong opinion i could also be happy with a versionless patch.

@@ -0,0 +1,11 @@
--- a/CMakeLists.txt
Copy link
Contributor

Choose a reason for hiding this comment

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

This file has the same content as pynest2d-4.8.0-fix-cpp-version.patch please reference this instead.

@@ -0,0 +1,24 @@
See https://github.com/Ultimaker/pynest2d/pull/3
Copy link
Contributor

Choose a reason for hiding this comment

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

This file has the same content as pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch please reference this instead.

~dev-python/uranium-${PV}[${PYTHON_SINGLE_USEDEP}]
~media-gfx/curaengine-${PV}
~media-gfx/fdm-materials-${PV}
dev-qt/qtquickcontrols[widgets]
Copy link
Contributor

Choose a reason for hiding this comment

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

should it not be dev-qt/qtquickcontrols2 ? Could you also add the slot to this dependency?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

tbh I just copied these verbatim from the bug https://bugs.gentoo.org/731274 I will ask the original submitter to comment here

~media-gfx/curaengine-${PV}
~media-gfx/fdm-materials-${PV}
dev-qt/qtquickcontrols[widgets]
dev-python/PyQt5[-debug]
Copy link
Contributor

Choose a reason for hiding this comment

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

dev-python/PyQt5 already listed on Line37

@hrnick
Copy link

hrnick commented Jun 7, 2021

Sorry, that could have been me who did not keep track on the ebuilds in my local repository when patching.

I have not been able to start cura for the past year due to qtquickcontrols not being build with the widgets USE flag (only qtquickcontrols, qtquickcontrols2 does not seem to matter when I tested). While troubleshooting and enabling the debug USE flag for a number of packages I came across the following bug:

Ultimaker/Cura#8875

I have tested that and it's happens for cura-4.9.1 as well.

So sorry for the mistake with having multiple PyQt5s in the ebuild but USE="-debug" has to be used for PyQt5 in order for cura to start.

@hrnick
Copy link

hrnick commented Jun 8, 2021

Another comment; I also changed the sip dependency in the libarcus ebuild to use <dev-python/sip-5.5.0 in my local repository since dev-python/sip-5.5.0 seems to break it (ModuleNotFoundError: No module named 'sip' when emerging).

@expeditioneer
Copy link
Contributor

@hrnick the dependency should be <dev-python/sip-5[${PYTHON_MULTI_USEDEP}] because libarcus is no SIP 5 compatible, see Ultimaker/libArcus#114

Closes: https://bugs.gentoo.org/793803
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Mathy Vanvoorden <mathy@vanvoorden.be>
Closes: https://bugs.gentoo.org/793803
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Mathy Vanvoorden <mathy@vanvoorden.be>
Closes: https://bugs.gentoo.org/793803
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Mathy Vanvoorden <mathy@vanvoorden.be>
Closes: https://bugs.gentoo.org/793803
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Mathy Vanvoorden <mathy@vanvoorden.be>
Closes: https://bugs.gentoo.org/793803
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Mathy Vanvoorden <mathy@vanvoorden.be>
Closes: https://bugs.gentoo.org/793803
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Mathy Vanvoorden <mathy@vanvoorden.be>
Closes: https://bugs.gentoo.org/793803
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Mathy Vanvoorden <mathy@vanvoorden.be>
Closes: https://bugs.gentoo.org/793803
Closes: https://bugs.gentoo.org/731274
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Mathy Vanvoorden <mathy@vanvoorden.be>
@MathyV
Copy link
Contributor Author

MathyV commented Jun 10, 2021

I updated the ebuilds:

  • Removed the duplicate patches
  • Merged the two pyqt5 use deps

As I also commented in https://bugs.gentoo.org/795072 there is already a hard dependency on < sip-5 in libarcus so not sure why you are seeing this @hrnick , my best bet is that you are building with ebuild or emerging with --nodeps, on my system portage respects the blocker and downgrades sip.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2021-06-10 07:15 UTC
Newest commit scanned: c235291
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/1a5db85a4a/output.html

@expeditioneer
Copy link
Contributor

@MathyV Thank you for your contribution! I'll merge this in a few seconds.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR.
Projects
None yet
5 participants