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

sci-libs/opencascade[vtk]: prevent name collision #21105

Closed
wants to merge 1 commit into from

Conversation

zavorka
Copy link
Contributor

@zavorka zavorka commented Jun 3, 2021

VTK-9.0 declares in their headers 'struct AllValues' which collides with
a macro defined by GLX.

This has been only partially fixed in the upstream:
https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commit;h=2c276f91da0

It was necessary to put #undefs in a few other places.

Closes: https://bugs.gentoo.org/794031
Signed-off-by: Roman Beranek roman.beranek@prusa3d.com

VTK-9.0 declares in their headers 'struct AllValues' which collides with
a macro defined by GLX.

This has been only partially fixed in the upstream:
https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commit;h=2c276f91da0

It was necessary to put `#undef`s in a few other places.

Closes: https://bugs.gentoo.org/794031
Signed-off-by: Roman Beranek <roman.beranek@prusa3d.com>
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @zavorka
Areas affected: ebuilds
Packages affected: sci-libs/opencascade

sci-libs/opencascade: @waebbl, @gentoo/proxy-maint

Linked bugs

Bugs linked: 794031


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 3, 2021
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2021-06-03 14:34 UTC
Newest commit scanned: 1a9a2f8
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/70b89833a2/output.html

Copy link
Contributor

@waebbl waebbl left a comment

Choose a reason for hiding this comment

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

lgtm
The patch works with 7.5.2 as well

@thesamesam
Copy link
Member

Could you rebase please?

@waebbl
Copy link
Contributor

waebbl commented Jun 12, 2021

@zavorka ping

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