public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/dump1090/, net-wireless/dump1090/files/
Date: Mon, 21 Apr 2025 22:54:06 +0000 (UTC)	[thread overview]
Message-ID: <1745276016.d710ecda3cacbcbcaa5787c777d0b4ee41b55c00.conikost@gentoo> (raw)

commit:     d710ecda3cacbcbcaa5787c777d0b4ee41b55c00
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 21 22:53:36 2025 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Apr 21 22:53:36 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d710ecda

net-wireless/dump1090: fix build with gcc15

Closes: https://bugs.gentoo.org/950449
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-wireless/dump1090/dump1090-10.0.1.ebuild       |  5 ++-
 net-wireless/dump1090/dump1090-9999.ebuild         |  5 ++-
 .../dump1090/files/dump1090-10.0.1-gcc15.patch     | 45 ++++++++++++++++++++++
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/net-wireless/dump1090/dump1090-10.0.1.ebuild b/net-wireless/dump1090/dump1090-10.0.1.ebuild
index 5e8fdbbc0c14..f58f38667d3a 100644
--- a/net-wireless/dump1090/dump1090-10.0.1.ebuild
+++ b/net-wireless/dump1090/dump1090-10.0.1.ebuild
@@ -38,7 +38,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-6.1-libdir.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1-libdir.patch
+	"${FILESDIR}"/${PN}-10.0.1-gcc15.patch
+)
 
 src_prepare() {
 	default

diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index 52be69c72a7f..798635aa0652 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-9999.ebuild
@@ -38,7 +38,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-6.1-libdir.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1-libdir.patch
+	"${FILESDIR}"/${PN}-10.0.1-gcc15.patch
+)
 
 src_prepare() {
 	default

diff --git a/net-wireless/dump1090/files/dump1090-10.0.1-gcc15.patch b/net-wireless/dump1090/files/dump1090-10.0.1-gcc15.patch
new file mode 100644
index 000000000000..ed0431405c21
--- /dev/null
+++ b/net-wireless/dump1090/files/dump1090-10.0.1-gcc15.patch
@@ -0,0 +1,45 @@
+From 93be1da123215e8ac15a0deaffedd480e8899f77 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Tue, 22 Apr 2025 00:41:31 +0200
+Subject: [PATCH] Fix compilation with GCC15
+
+---
+ ais_charset.c | 2 +-
+ ais_charset.h | 2 +-
+ interactive.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ais_charset.c b/ais_charset.c
+index a487e3cc7..0d3af0392 100644
+--- a/ais_charset.c
++++ b/ais_charset.c
+@@ -1,3 +1,3 @@
+ #include "ais_charset.h"
+ 
+-char ais_charset[64] = "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_ !\"#$%&'()*+,-./0123456789:;<=>?";
++char ais_charset[65] = "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_ !\"#$%&'()*+,-./0123456789:;<=>?";
+diff --git a/ais_charset.h b/ais_charset.h
+index 93d4a7293..95ef373dc 100644
+--- a/ais_charset.h
++++ b/ais_charset.h
+@@ -1,6 +1,6 @@
+ #ifndef AIS_CHARSET_H
+ #define AIS_CHARSET_H
+ 
+-extern char ais_charset[64];
++extern char ais_charset[65];
+ 
+ #endif
+diff --git a/interactive.c b/interactive.c
+index 8761c955d..75775ad35 100644
+--- a/interactive.c
++++ b/interactive.c
+@@ -140,7 +140,7 @@ void interactiveShowData(void) {
+     static bool need_clear = true;
+     uint64_t now = mstime();
+     char progress;
+-    char spinner[4] = "|/-\\";
++    char spinner[5] = "|/-\\";
+     int valid = 0;
+     double signalMax = -100.0;
+     double signalMin = +100.0;


             reply	other threads:[~2025-04-21 22:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-21 22:54 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-10-14 10:00 [gentoo-commits] repo/gentoo:master commit in: net-wireless/dump1090/, net-wireless/dump1090/files/ Sam James
2021-08-12 22:53 Robin H. Johnson

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=1745276016.d710ecda3cacbcbcaa5787c777d0b4ee41b55c00.conikost@gentoo \
    --to=conikost@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