commit: e23492ce36ff9e5b68d08d448232e1d3442bba2f Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Tue Jun 10 21:07:35 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 12 11:08:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23492ce
media-sound/cantata: fix ODR violations fix multiple ODR violations with cddb or udisks enabled. Move enums into class scope in headers. > online/podcastsearchdialog.cpp:67:6: > error: type ‘Roles’ violates the C++ One Definition Rule > devices/albumdetailsdialog.cpp:311:6: > note: an enum with different value name is defined in another translation unit > gui/initialsettingswizard.cpp:44:6: > error: type ‘Pages’ violates the C++ One Definition Rule > devices/actiondialog.cpp:68:6: > note: an enum with different value name is defined in another translation unit Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/42541 Closes: https://github.com/gentoo/gentoo/pull/42541 Signed-off-by: Sam James <sam <AT> gentoo.org> media-sound/cantata/cantata-3.3.0.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media-sound/cantata/cantata-3.3.0.ebuild b/media-sound/cantata/cantata-3.3.0.ebuild index 0eead19fecd0..d0302a32da07 100644 --- a/media-sound/cantata/cantata-3.3.0.ebuild +++ b/media-sound/cantata/cantata-3.3.0.ebuild @@ -58,6 +58,9 @@ PATCHES=( "${FILESDIR}"/${PN}-3.3.0-rm-vendor.patch # https://github.com/nullobsi/cantata/pull/51.patch "${FILESDIR}"/${PN}-3.3.0-cdparanoia.patch + # Fix ODR violations with cddb or udisks enabled + # https://github.com/nullobsi/cantata/pull/71.patch + "${FILESDIR}"/${PN}-3.3.0-fix_odr.patch ) src_prepare() {
