[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/, media-libs/nas/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/, media-libs/nas/files/

[Andreas Sturmlechner]

commit:     751e74cd39901a3f71efadaaa201e51ea50eb775
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 22 22:23:01 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 22 22:23:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=751e74cd

media-libs/nas: link against libfl

Thanks-to: Mihai Moldovan <ionic <AT> ionic.de>
Closes: https://bugs.gentoo.org/612270
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-libs/nas/files/nas-1.9.4-libfl.patch | 12 ++++++++++++
 media-libs/nas/nas-1.9.4-r2.ebuild         |  1 +
 2 files changed, 13 insertions(+)

diff --git a/media-libs/nas/files/nas-1.9.4-libfl.patch b/media-libs/nas/files/nas-1.9.4-libfl.patch
new file mode 100644
index 00000000000..cea30f46ba6
--- /dev/null
+++ b/media-libs/nas/files/nas-1.9.4-libfl.patch
@@ -0,0 +1,12 @@
+diff -pur nas-1.9.4-orig/server/Imakefile nas-1.9.4/server/Imakefile
+--- a/server/Imakefile	2013-04-27 02:41:06.000000000 +0200
++++ b/server/Imakefile	2017-03-14 18:58:27.445311356 +0100
+@@ -57,7 +57,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
+ 
+ # endif
+ #else
+-        SYSLIBS =
++        SYSLIBS = $(LEXLIB)
+ #endif
+ 
+ #ifdef NetBSDArchitecture

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index 909424ef8e2..0d4e1ea4136 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -37,6 +37,7 @@ DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.9.2-asneeded.patch
 	"${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
+	"${FILESDIR}"/${PN}-1.9.4-libfl.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/nas/, media-libs/nas/files/

[Aaron Bauman]

commit:     78368340e8df47f36adcd144c744197eebadfff5
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Mar 18 12:08:52 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri May 15 18:19:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78368340

media-libs/nas: fix compiling on gcc 10 (#707968)

Closes: https://bugs.gentoo.org/707968
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15001
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 media-libs/nas/files/nas-1.9.4-fno-config.patch | 42 +++++++++++++++++++++++++
 media-libs/nas/nas-1.9.4-r2.ebuild              |  7 +++--
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/media-libs/nas/files/nas-1.9.4-fno-config.patch b/media-libs/nas/files/nas-1.9.4-fno-config.patch
new file mode 100644
index 00000000000..e5ce72d37d9
--- /dev/null
+++ b/media-libs/nas/files/nas-1.9.4-fno-config.patch
@@ -0,0 +1,42 @@
+From f1e8e0da221152560efcb097c00539476071047c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Thu, 23 Jan 2020 13:43:12 +0100
+Subject: [PATCH] Fix building with GCC 10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 10 defaults to -fno-common and as a result raises an arror when
+linking nasd:
+
+gcc -o nasd -O2 -fno-strict-aliasing   -Wl,-z,relro -Wl,--as-needed  -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld  -L../lib/audio -L/usr/lib64 -L/usr/lib64    dia/libdia.a dda/voxware/libvoxware.a os/libos.a
+/usr/bin/ld: dia/libdia.a(lex.o): in function `$d':
+lex.c:(.bss+0x48): multiple definition of `yyin'; dia/libdia.a(main.o):/builddir/build/BUILD/nas-1.9.4/server/dia/main.c:79: first defined here
+collect2: error: ld returned 1 exit status
+
+The reason is that both lex.c (generated from lex.l) and main.c
+define yyin global variable.
+
+This patch changes the main.c definition into a declaration.
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ server/dia/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/server/dia/main.c b/server/dia/main.c
+index 462e89b..9ea2a12 100644
+--- a/server/dia/main.c
++++ b/server/dia/main.c
+@@ -76,7 +76,7 @@ static char *AuServerName(void);
+ extern char *display;
+ 
+ static int restart = 0;
+-FILE *yyin;                     /* for the config parser */
++extern FILE *yyin;                     /* for the config parser */
+ 
+ void
+ NotImplemented()
+-- 
+2.26.2
+

diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index f83d66bb9d9..2965f1bf3de 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -35,9 +35,10 @@ DEPEND="${RDEPEND}
 DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.2-asneeded.patch
-	"${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
-	"${FILESDIR}"/${PN}-1.9.4-libfl.patch
+	"${FILESDIR}/${PN}-1.9.2-asneeded.patch"
+	"${FILESDIR}/${P}-remove-abs-fabs.patch"
+	"${FILESDIR}/${P}-libfl.patch"
+	"${FILESDIR}/${P}-fno-config.patch"
 )
 
 src_prepare() {