commit:     9164bf6c603ffba9506aaf0925eaef830da352fd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 13 04:12:32 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 13 05:18:20 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9164bf6c

sys-libs/gwenhywfar: fix build w/ c23

Closes: https://bugs.gentoo.org/955862
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../gwenhywfar/files/gwenhywfar-5.12.0-c23.patch   | 32 ++++++++++++++++++++++
 sys-libs/gwenhywfar/gwenhywfar-5.12.0-r1.ebuild    |  4 +++
 2 files changed, 36 insertions(+)

diff --git a/sys-libs/gwenhywfar/files/gwenhywfar-5.12.0-c23.patch 
b/sys-libs/gwenhywfar/files/gwenhywfar-5.12.0-c23.patch
new file mode 100644
index 000000000000..56caa6d9187c
--- /dev/null
+++ b/sys-libs/gwenhywfar/files/gwenhywfar-5.12.0-c23.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/955862
+https://github.com/aqbanking/gwenhywfar/commit/3a31e47cf14a4683c13ad81b57af0dd8b56d5353
+
+From 3a31e47cf14a4683c13ad81b57af0dd8b56d5353 Mon Sep 17 00:00:00 2001
+From: Micha Lenk <[email protected]>
+Date: Sun, 23 Feb 2025 21:44:55 +0100
+Subject: [PATCH] Remove double declaration of HtmlObject_Grid_new
+
+This fixes a build failure when compiling with GCC 15 due to conflicting
+declarations of HtmlObject_Grid_new.
+
+The build failure was initially reported by Matthias Klose <[email protected]> as
+Debian bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097194
+---
+ src/html/o_grid_p.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/html/o_grid_p.h b/src/html/o_grid_p.h
+index 33f218be..7c2ebd18 100644
+--- a/src/html/o_grid_p.h
++++ b/src/html/o_grid_p.h
+@@ -15,9 +15,6 @@
+ #include "o_grid_l.h"
+ 
+ 
+-HTML_OBJECT *HtmlObject_Grid_new();
+-
+-
+ typedef struct OBJECT_GRID OBJECT_GRID;
+ struct OBJECT_GRID {
+   int rows;
+

diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.12.0-r1.ebuild 
b/sys-libs/gwenhywfar/gwenhywfar-5.12.0-r1.ebuild
index 329833205f64..938515ddd5b9 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-5.12.0-r1.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-5.12.0-r1.ebuild
@@ -47,6 +47,10 @@ BDEPEND="
 "
 # doc? ( app-text/doxygen )
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-5.12.0-c23.patch
+)
+
 src_configure() {
        local myeconfargs=(
                --with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"

Reply via email to