Summary: | x11-misc/kdocker-5.2 : /.../qactiongroup.h:64:9: error: expected identifier before numeric constant | ||
---|---|---|---|
Product: | Gentoo Linux | Reporter: | Toralf Förster <toralf> |
Component: | Current packages | Assignee: | Nikos Chantziaras <realnc> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | proxy-maint |
Priority: | Normal | Keywords: | PullRequest |
Version: | unspecified | ||
Hardware: | All | ||
OS: | Linux | ||
See Also: | https://github.com/gentoo/gentoo/pull/14181 | ||
Whiteboard: | |||
Package list: | Runtime testing required: | --- | |
Attachments: |
emerge-info.txt
emerge-history.txt environment etc.portage.tbz2 temp.tbz2 x11-misc:kdocker-5.2:20191223-204408.log |
Description
Toralf Förster
2019-12-26 21:17:38 UTC
Created attachment 600664 [details]
emerge-info.txt
Created attachment 600666 [details]
emerge-history.txt
Created attachment 600668 [details]
environment
Created attachment 600670 [details]
etc.portage.tbz2
Created attachment 600672 [details]
temp.tbz2
Created attachment 600674 [details]
x11-misc:kdocker-5.2:20191223-204408.log
This is a conflict between /usr/include/X11/X.h and /usr/include/qt5/QtWidgets/qactiongroup.h. X.h defines 'None' as a macro: #ifndef None #define None 0L>/* universal null resource or null atom */ #endif and as a result this breaks qactiongroup.h: enum class ExclusionPolicy { None, Exclusive, ExclusiveOptional }; This enum didn't exist before Qt 5.14. Opened a github PR with a patch. Also sent the patch upstream: https://github.com/user-none/KDocker/pull/60 The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3976f8b771939a59857f3f6e5f7557aa49cb65f commit a3976f8b771939a59857f3f6e5f7557aa49cb65f Author: Nikos Chantziaras <realnc@gmail.com> AuthorDate: 2019-12-30 14:22:51 +0000 Commit: Andreas Sturmlechner <asturm@gentoo.org> CommitDate: 2020-01-01 07:55:09 +0000 x11-misc/kdocker: fix Qt 5.14 build, EAPI 7 Closes: https://bugs.gentoo.org/703882 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Nikos Chantziaras <realnc@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/14181 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> x11-misc/kdocker/files/qt-5.14.patch | 38 ++++++++++++++++++++++++++++++++++++ x11-misc/kdocker/kdocker-5.2.ebuild | 18 +++++++---------- 2 files changed, 45 insertions(+), 11 deletions(-) |