commit:     71a651811af4f834c90af4af08e24e2c315c59b8
Author:     Mats Lidell <matsl <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 30 21:28:50 2025 +0000
Commit:     Mats Lidell <matsl <AT> gentoo <DOT> org>
CommitDate: Sat Aug 30 21:32:30 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a65181

app-editors/xemacs: avoid #embed with GCC 15

Bug: https://bugs.gentoo.org/959756
Signed-off-by: Mats Lidell <matsl <AT> gentoo.org>

 app-editors/xemacs/files/xemacs-21.5.36-embed.patch    | 18 ++++++++++++++++++
 ...macs-21.5.36-r1.ebuild => xemacs-21.5.36-r2.ebuild} |  1 +
 2 files changed, 19 insertions(+)

diff --git a/app-editors/xemacs/files/xemacs-21.5.36-embed.patch 
b/app-editors/xemacs/files/xemacs-21.5.36-embed.patch
new file mode 100644
index 000000000000..82d6d6c79cae
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.36-embed.patch
@@ -0,0 +1,18 @@
+changeset:   7754:f38cf80e1163
+user:        Aidan Kehoe <[email protected]>
+date:        Fri Aug 29 07:35:13 2025 +0100
+summary:     Fall back to INCBIN(), avoid #embed with GCC 15. Thank you Leonid 
Kopylov!
+
+diff -r 887fd62b88bd -r f38cf80e1163 src/dump-data.c
+--- a/src/dump-data.c  Tue Aug 26 18:27:00 2025 +0100
++++ b/src/dump-data.c  Fri Aug 29 07:35:13 2025 +0100
+@@ -24,7 +24,7 @@
+ #include "lisp.h"
+ #include "dump-data.h"
+ 
+-#ifdef __has_embed
++#if defined (__has_embed) && !(GCC_VERSION > NEED_GCC (15, 0, 0))
+ #include <stdalign.h>
+ 
+ alignas (16) static Rawbyte dumped_data[] = {
+

diff --git a/app-editors/xemacs/xemacs-21.5.36-r1.ebuild 
b/app-editors/xemacs/xemacs-21.5.36-r2.ebuild
similarity index 99%
rename from app-editors/xemacs/xemacs-21.5.36-r1.ebuild
rename to app-editors/xemacs/xemacs-21.5.36-r2.ebuild
index d566954e4b58..6d8ca659530b 100644
--- a/app-editors/xemacs/xemacs-21.5.36-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.36-r2.ebuild
@@ -65,6 +65,7 @@ src_prepare() {
        eapply "${FILESDIR}/${P}-failing-tests.patch"
        eapply "${FILESDIR}/${P}-failing-tests-2.patch"
        eapply "${FILESDIR}/${P}-configure-postgresql.patch"
+       eapply "${FILESDIR}/${P}-embed.patch"
        eapply_user
 
        eautoconf

Reply via email to