public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
Date: Fri,  1 Nov 2024 06:29:47 +0000 (UTC)	[thread overview]
Message-ID: <1730442575.6f7cbc8f74a55a157e03c90557427790bf5975bf.fordfrog@gentoo> (raw)

commit:     6f7cbc8f74a55a157e03c90557427790bf5975bf
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  1 06:29:35 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Nov  1 06:29:35 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f7cbc8f

media-sound/audacity: fixed build of 3.7.0 with clang

Bug: https://bugs.gentoo.org/915041
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/audacity/audacity-3.7.0.ebuild           |  3 +++
 ...clude-template-on-unix-to-fix-clang-compile.patch | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/media-sound/audacity/audacity-3.7.0.ebuild b/media-sound/audacity/audacity-3.7.0.ebuild
index 3b9ac4e8b0de..100dac9a70a6 100644
--- a/media-sound/audacity/audacity-3.7.0.ebuild
+++ b/media-sound/audacity/audacity-3.7.0.ebuild
@@ -136,6 +136,9 @@ PATCHES=(
 
 	# #920363
 	"${FILESDIR}/audacity-3.7.0-audiocom-std-string.patch"
+
+	# 915041
+	"${FILESDIR}/audacity-3.7.0-do-not-include-template-on-unix-to-fix-clang-compile.patch"
 )
 
 src_prepare() {

diff --git a/media-sound/audacity/files/audacity-3.7.0-do-not-include-template-on-unix-to-fix-clang-compile.patch b/media-sound/audacity/files/audacity-3.7.0-do-not-include-template-on-unix-to-fix-clang-compile.patch
new file mode 100644
index 000000000000..0feeebd8073c
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.7.0-do-not-include-template-on-unix-to-fix-clang-compile.patch
@@ -0,0 +1,20 @@
+From e421fc29f044d88b4036b3004714ec353b1527aa Mon Sep 17 00:00:00 2001
+From: "David C. Manuelda" <StormByte@gmail.com>
+Date: Fri, 1 Nov 2024 05:58:16 +0100
+Subject: [PATCH] Do not include template on Unix to fix clang compile issue
+
+Signed-off-by: David C. Manuelda <StormByte@gmail.com>
+--- a/src/ListNavigationPanel.h
++++ b/src/ListNavigationPanel.h
+@@ -13,7 +13,7 @@
+ #include <wx/window.h>
+ #include <wx/containr.h>
+ 
+-#if !defined(__FreeBSD__) && !defined(__OpenBSD__)
++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__UNIX__)
+ extern template class WXDLLIMPEXP_CORE wxNavigationEnabled<wxWindow>;
+ #endif
+ 
+-- 
+2.47.0
+


             reply	other threads:[~2024-11-01  6:29 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-01  6:29 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-24  7:34 [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/ Sam James
2024-10-25 20:30 Andreas K. Hüttel
2024-04-02 10:28 Sam James
2024-03-23  8:29 Sam James
2024-01-16  3:36 Sam James
2023-06-30 12:31 David Seifert
2023-04-15  0:47 Sam James
2023-01-20 22:18 Arsen Arsenović
2020-09-02  8:33 Miroslav Šulc
2020-08-06  4:57 Miroslav Šulc
2018-02-21 11:08 Lars Wendler
2018-02-21 11:08 Lars Wendler
2018-02-18 11:13 Lars Wendler
2017-06-05  9:45 Pacho Ramos

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=1730442575.6f7cbc8f74a55a157e03c90557427790bf5975bf.fordfrog@gentoo \
    --to=fordfrog@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