From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1648379-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 638CB15834D
for <garchives@archives.gentoo.org>; Sun, 30 Jun 2024 11:01:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8AD932BC014;
Sun, 30 Jun 2024 11:01:25 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5D9912BC014
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Jun 2024 11:01:25 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 3AFF233BE3B
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Jun 2024 11:01:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 915F91BC0
for <gentoo-commits@lists.gentoo.org>; Sun, 30 Jun 2024 11:01:22 +0000 (UTC)
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" <fordfrog@gentoo.org>
Message-ID: <1719745273.af5d77ccbceaf50f65a7da061f83ae0d8c0aa061.fordfrog@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/nas/files/, media-libs/nas/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/nas/files/nas-1.9.5-gcc14-build-fix.patch media-libs/nas/nas-1.9.5-r1.ebuild media-libs/nas/nas-1.9.5-r2.ebuild
X-VCS-Directories: media-libs/nas/files/ media-libs/nas/
X-VCS-Committer: fordfrog
X-VCS-Committer-Name: Miroslav Šulc
X-VCS-Revision: af5d77ccbceaf50f65a7da061f83ae0d8c0aa061
X-VCS-Branch: master
Date: Sun, 30 Jun 2024 11:01:22 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4839dd94-a1b9-4a8a-a99f-b3ba700e2f7c
X-Archives-Hash: 161f97d873b41eb0acc1a58746623746
commit: af5d77ccbceaf50f65a7da061f83ae0d8c0aa061
Author: Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sat Jun 29 18:07:30 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 11:01:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5d77cc
media-libs/nas: Fix passing of incompatible pointer type
Closes: https://bugs.gentoo.org/927451
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36484
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../nas/files/nas-1.9.5-gcc14-build-fix.patch | 76 ++++++++++++++++++++++
.../{nas-1.9.5-r1.ebuild => nas-1.9.5-r2.ebuild} | 3 +-
2 files changed, 78 insertions(+), 1 deletion(-)
diff --git a/media-libs/nas/files/nas-1.9.5-gcc14-build-fix.patch b/media-libs/nas/files/nas-1.9.5-gcc14-build-fix.patch
new file mode 100644
index 000000000000..629bd5dff2f0
--- /dev/null
+++ b/media-libs/nas/files/nas-1.9.5-gcc14-build-fix.patch
@@ -0,0 +1,76 @@
+https://sourceforge.net/p/nas/bugs/15/
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Tue, 30 Apr 2024 01:06:32 +0530
+Subject: [PATCH 1/1] Partially revert commit e792e42
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit e792e42 introduced some regression with GCC 14 and 15 espcially
+to the chaged sections of the code in audemo.c. Thus resutling in errors
+such as:
+
+audemo.c: In function ‘rescanCB’:
+audemo.c:524:23: error: passing argument 2 of ‘XawListChange’ from incompatible pointer type [-Wincompatible-pointer-types]
+ 524 | (const char **)makeFileList(globals->fileNames, globals->numFiles),
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ | |
+ | const char **
+In file included from audemo.c:97:
+/usr/include/X11/Xaw/List.h:170:26: note: expected ‘char **’ but argument is of type ‘const char **’
+ 170 | String *list,
+ | ~~~~~~~~~~~~~~~~~~~~~~~~^~~~
+audemo.c:530:41: error: passing argument 2 of ‘XawListChange’ from incompatible pointer type [-Wincompatible-pointer-types]
+ 530 | XawListChange(globals->samples, &noFilesString, 1, -1, True);
+ | ^~~~~~~~~~~~~~
+ | |
+ | const char **
+/usr/include/X11/Xaw/List.h:170:26: note: expected ‘char **’ but argument is of type ‘const char **’
+ 170 | String *list,
+ | ~~~~~~~~~~~~~~~~~~~~~~~~^~~~
+
+First observed on Gentoo Linux with GCC 14, I reproduced with GCC 15 as
+well. Please reffer: https://bugs.gentoo.org/927451
+
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/clients/audio/audemo/audemo.c
++++ b/clients/audio/audemo/audemo.c
+@@ -501,7 +501,7 @@ static void
+ rescanCB(Widget w, XtPointer globalsp, XtPointer call_data)
+ {
+ GlobalDataPtr globals = (GlobalDataPtr) globalsp;
+- static const char *noFilesString = "No files found";
++ static char *noFilesString = "No files found";
+ char *dir,
+ *template;
+ int i;
+@@ -521,7 +521,7 @@ rescanCB(Widget w, XtPointer globalsp, XtPointer call_data)
+ if (globals->numFiles)
+ {
+ XawListChange(globals->samples,
+- (const char **)makeFileList(globals->fileNames, globals->numFiles),
++ makeFileList(globals->fileNames, globals->numFiles),
+ globals->numFiles, -1, True);
+ XtSetSensitive(globals->samples, True);
+ }
+@@ -597,7 +597,7 @@ bucketQueryCB(Widget w, XtPointer globalsp, XtPointer call_data)
+ access[4],
+ desc[COMMENT_LEN];
+ int i;
+- static const char *noBucketString = "No buckets";
++ static char *noBucketString = "No buckets";
+
+ if (buf->numBuckets)
+ {
+@@ -652,7 +652,7 @@ bucketQueryCB(Widget w, XtPointer globalsp, XtPointer call_data)
+
+ if (buf->numBuckets)
+ {
+- XawListChange(buf->bucketList, (const char **)buf->bucketText,
++ XawListChange(buf->bucketList, buf->bucketText,
+ buf->numBuckets, -1, True);
+ XtSetSensitive(buf->bucketList, True);
+ }
+--
+2.45.0.rc1.218.g7b19149425.dirty
+
diff --git a/media-libs/nas/nas-1.9.5-r1.ebuild b/media-libs/nas/nas-1.9.5-r2.ebuild
similarity index 96%
rename from media-libs/nas/nas-1.9.5-r1.ebuild
rename to media-libs/nas/nas-1.9.5-r2.ebuild
index 79a34f036d84..fe99a2a96c22 100644
--- a/media-libs/nas/nas-1.9.5-r1.ebuild
+++ b/media-libs/nas/nas-1.9.5-r2.ebuild
@@ -7,7 +7,7 @@ inherit flag-o-matic multilib multilib-minimal toolchain-funcs
DESCRIPTION="Network Audio System"
HOMEPAGE="https://radscan.com/nas.html"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.9.5-patches.tar.xz"
LICENSE="HPND MIT"
@@ -41,6 +41,7 @@ DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
PATCHES=(
"${WORKDIR}"/${PN}-1.9.5-patches
+ "${FILESDIR}"/${PN}-1.9.5-gcc14-build-fix.patch
)
src_prepare() {