From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/
Date: Thu, 12 Jun 2025 11:09:21 +0000 (UTC) [thread overview]
Message-ID: <1749726522.e23492ce36ff9e5b68d08d448232e1d3442bba2f.sam@gentoo> (raw)
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() {
next reply other threads:[~2025-06-12 11:09 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-12 11:09 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-08-27 19:25 [gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/ Arthur Zamarin
2025-04-01 18:43 Arthur Zamarin
2025-04-01 18:43 Arthur Zamarin
2024-05-07 7:57 Andreas K. Hüttel
2023-11-26 23:29 Andreas Sturmlechner
2022-10-10 8:39 Andreas Sturmlechner
2022-07-17 7:22 Andreas Sturmlechner
2022-05-09 7:33 Jakov Smolić
2022-05-09 7:33 Jakov Smolić
2022-03-16 16:40 Andreas Sturmlechner
2020-11-02 14:14 Andreas Sturmlechner
2020-11-02 12:48 Sam James
2020-10-18 18:06 Thomas Deutschmann
2020-09-20 22:03 Andreas Sturmlechner
2020-04-26 12:26 David Seifert
2020-03-21 17:45 Andreas Sturmlechner
2020-02-24 22:14 Andreas Sturmlechner
2019-07-15 20:52 Andreas Sturmlechner
2019-02-20 13:23 Mikle Kolyada
2019-02-17 16:19 Andreas Sturmlechner
2019-02-14 18:37 Andreas Sturmlechner
2019-01-06 20:53 Andreas Sturmlechner
2018-11-29 20:19 Andreas Sturmlechner
2018-10-05 20:59 Andreas Sturmlechner
2018-10-05 4:10 Thomas Deutschmann
2018-09-30 22:01 Andreas Sturmlechner
2018-06-23 19:56 Andreas Sturmlechner
2018-04-25 16:34 Andreas Sturmlechner
2018-04-25 16:34 Andreas Sturmlechner
2017-11-19 6:10 Michael Palimaka
2017-11-14 21:44 Thomas Deutschmann
2017-11-11 19:39 Andreas Sturmlechner
2017-10-28 7:43 Andreas Sturmlechner
2017-10-27 12:54 Thomas Deutschmann
2017-08-02 19:30 Andreas Sturmlechner
2016-12-20 9:31 Johannes Huber
2016-12-20 9:31 Johannes Huber
2016-11-05 16:06 Michael Palimaka
2016-07-21 9:40 Michael Palimaka
2016-06-06 7:07 Johannes Huber
2016-05-17 13:29 Johannes Huber
2015-09-01 19:55 Tobias Klausmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1749726522.e23492ce36ff9e5b68d08d448232e1d3442bba2f.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox