public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Eli Schwartz" <eschwartz@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/libmspub/files/, app-text/libmspub/
Date: Fri, 16 Aug 2024 01:16:18 +0000 (UTC)	[thread overview]
Message-ID: <1723770757.f5541d1deb040690b1e876fb5a69eb489be13c30.eschwartz@gentoo> (raw)

commit:     f5541d1deb040690b1e876fb5a69eb489be13c30
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 01:11:17 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 01:12:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5541d1d

app-text/libmspub: backport another missing include for gcc-15 this time

Closes: https://bugs.gentoo.org/937418
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 app-text/libmspub/files/libmspub-0.1.4-gcc15.patch | 42 ++++++++++++++++++++++
 app-text/libmspub/libmspub-0.1.4.ebuild            |  7 +++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/app-text/libmspub/files/libmspub-0.1.4-gcc15.patch b/app-text/libmspub/files/libmspub-0.1.4-gcc15.patch
new file mode 100644
index 000000000000..31377b852de4
--- /dev/null
+++ b/app-text/libmspub/files/libmspub-0.1.4-gcc15.patch
@@ -0,0 +1,42 @@
+From 06cd691e6d9664847d0fb5f096e296be85bedc59 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@gentoo.org>
+Date: Thu, 15 Aug 2024 20:55:25 -0400
+Subject: [PATCH] fix missing include
+
+int64_t comes from stdint.h, but it was never included. This is
+transitively provided by some headers, on some versions of GCC, but in
+GCC 15 a bit of routine cleanup means this header is no longer silently
+exposed to arbitrary codebases without asking.
+
+As such, it fails to build.
+
+In upstream libmspub commit 28c545e7d04d58af998bcf4af5d1bb326d29836c,
+the boost cstdint header was added as part of other work. I am not sure
+why -- maybe to fix this missing header? :D But using all of boost for
+this is a bit odd and unnecessary, especially when not backporting an
+entire commit.
+
+Add in the correct stdlib header as a local backport while distros wait
+for libmspub to release a new version.
+
+Signed-off-by: Eli Schwartz <eschwartz@gentoo.org>
+---
+ src/lib/Coordinate.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/lib/Coordinate.h b/src/lib/Coordinate.h
+index bec3fe2..b87608d 100644
+--- a/src/lib/Coordinate.h
++++ b/src/lib/Coordinate.h
+@@ -10,6 +10,8 @@
+ #ifndef INCLUDED_COORDINATE_H
+ #define INCLUDED_COORDINATE_H
+ 
++#include <cstdint>
++
+ #include "MSPUBConstants.h"
+ 
+ namespace libmspub
+-- 
+2.44.2
+

diff --git a/app-text/libmspub/libmspub-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
index 78d0df1963cf..40612b0cc463 100644
--- a/app-text/libmspub/libmspub-0.1.4.ebuild
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -33,7 +33,12 @@ BDEPEND="
 	doc? ( app-text/doxygen )
 "
 
-PATCHES=( "${FILESDIR}/${P}-gcc10.patch" )
+PATCHES=(
+	# upstream backport
+	"${FILESDIR}/${P}-gcc10.patch"
+	# manually backported
+	"${FILESDIR}/${P}-gcc15.patch"
+)
 
 src_prepare() {
 	default


                 reply	other threads:[~2024-08-16  1:16 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=1723770757.f5541d1deb040690b1e876fb5a69eb489be13c30.eschwartz@gentoo \
    --to=eschwartz@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