4 files changed, 45 insertions, 90 deletions
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index b1474936af60..604656c99352 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,5 +1,4 @@
-DIST gwenhywfar-5.10.1.tar.gz 2687042 BLAKE2B 78fb776a605761f309060affef4e84e526ba789039f48f1e68e107d5002c508e19c9c2c2c0b3a8aba39c6c32543816914b504a6212219cfeeb4f0f04b0354f45 SHA512 11781bec2dd1c4156b609574283179278b8070d604a792aeddf92c8f9b873b3ac09273a8558b9adba567af8d016ea10914d2a149f4b6813798b5800e34e29aa5
+AUX gwenhywfar-5.12.0-c23.patch 959 BLAKE2B 34ffdf3d1024516c56fbbf7a58a5e873f34801cfdba115cd9ad6323d6728d2210c4a65ef2e3365d99c4732c5c2c9b2c255090688c78fa51718a59901fad30eac SHA512 166cd7f95ab34a043d291d65c16b1a27e50b766c3231bdc7b3baad5872682777beb6fff39ec3c99d0d3facf49d41c3e63ffa37e1337a3665103e3c8c74da5a3b
 DIST gwenhywfar-5.12.0.tar.gz 2721790 BLAKE2B 99c875ff9de6908ebba92cda1fdca62a6c12d3c3994328b207e36003a0ce478abd6777a4a0a73669c9b85a28591429f14ca73a32695f7ee8d226a4aca69f9922 SHA512 0075eb626f0022ecd4ffdd59de7f0817d2def685e1d2cfbca9a32faa4b8d4d213bea631f24c5385da0b8c7743fd6d1887a46f08afa371195d911409ec7655791
-EBUILD gwenhywfar-5.10.1.ebuild 1710 BLAKE2B a70d7a946c1ec3461df64b570dfb1e6fc2a12d15fcd3c3c2384ee72b6f076de8825dc4b5eeebc33d424813089d960f8c4aa24bcdad0b0b437ca5044f9fd52595 SHA512 69add9a5bb8b8ec79afe93d2a2257845c669d74f78d88edcf74fd7f511bc1c825f427253fa99bccf888afe1ce341bf836ed028a1f6f80514bcf38d4e639a7485
-EBUILD gwenhywfar-5.12.0.ebuild 1661 BLAKE2B b6def3b554db56ad57496375eba84f9d160c994b232ada50e692fdda9689d32583861e724a344f323c02fa8d23e890055929c61a2656c00eb6625f1738986808 SHA512 e25eb1482caacefdeacf4de7f975a48024ec52897b30f42b0bfd369220636245545f465a1c47bd398db9f24973a8ba3c03b1d326165040a9f95dc093ac4cdc98
+EBUILD gwenhywfar-5.12.0-r1.ebuild 1741 BLAKE2B 3c269a9a9caafb9e529ec617c24b1aca3baefb87c0534e2a4d71843ac11b75b1b8820bf2d3abee6b3f53fb943a5ce27166790b1ba7fa4f21b9cab7854d0db17c SHA512 7dc0829ce0b0de111f51c1e85273278ca6eb0fcb8952443fcc8b79bf2cd15d6a19e6902272899e12baeb6e17269d11aab545ca7c3bd6eb68800fa0771020203b
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
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 <micha@lenk.info>
+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 <doko@debian.org> 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.10.1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.10.1.ebuild
deleted file mode 100644
index 8d4759d13614..000000000000
--- a/sys-libs/gwenhywfar/gwenhywfar-5.10.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-DESCRIPTION="Multi-platform helper library for other libraries"
-HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
-SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/465/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/79" # correspond with libgwenhywfar.so version
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="debug doc gtk qt5 test"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-DEPEND="
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	dev-libs/libxml2:2
-	dev-libs/openssl:0=
-	net-libs/gnutls:=
-	virtual/libiconv
-	virtual/libintl
-	virtual/opengl
-	gtk? ( x11-libs/gtk+:3 )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsql:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-"
-RDEPEND="
-	${DEPEND}
-	gtk? ( !<app-office/gnucash-3.7[aqbanking] )
-"
-
-# broken upstream, reported but got no reply
-RESTRICT+=" test"
-
-src_configure() {
-	local myeconfargs=(
-		--with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
-		--with-libxml2-code=yes
-		$(use_enable debug)
-		$(use_enable doc full-doc)
-	)
-	use qt5 && myeconfargs+=(
-		--with-qt5-moc="$(qt5_get_bindir)/moc"
-		--with-qt5-qmake="$(qt5_get_bindir)/qmake"
-	)
-
-	local guis=()
-	use gtk && guis+=( gtk3 )
-	use qt5 && guis+=( qt5 )
-	econf "${myeconfargs[@]}" "--with-guis=${guis[*]}"
-}
-
-src_compile() {
-	emake
-	use doc && emake srcdoc
-}
-
-src_install() {
-	default
-	use doc && emake DESTDIR="${D}" install-srcdoc
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.12.0.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.12.0-r1.ebuild
index aef1809cabc3..938515ddd5b9 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-5.12.0.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-5.12.0-r1.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/529/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/79" # correspond with libgwenhywfar.so version
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="debug doc gtk qt5 test"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+IUSE="debug gtk qt5 test" # doc (is broken, bug #950614
 
 # broken upstream, reported but got no reply
 RESTRICT="test"
@@ -20,7 +20,7 @@ RESTRICT="test"
 DEPEND="
 	dev-libs/libgcrypt:0=
 	dev-libs/libgpg-error
-	dev-libs/libxml2:2
+	dev-libs/libxml2:2=
 	dev-libs/openssl:0=
 	net-libs/gnutls:=
 	virtual/libiconv
@@ -44,15 +44,19 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
-	doc? ( app-text/doxygen )
 "
+# doc? ( app-text/doxygen )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.12.0-c23.patch
+)
 
 src_configure() {
 	local myeconfargs=(
 		--with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
 		--with-libxml2-code=yes
 		$(use_enable debug)
-		$(use_enable doc full-doc)
+		#$(use_enable doc full-doc)
 	)
 	use qt5 && myeconfargs+=(
 		--with-qt5-moc="$(qt5_get_bindir)/moc"
@@ -67,11 +71,11 @@ src_configure() {
 
 src_compile() {
 	emake
-	use doc && emake srcdoc
+	#use doc && emake srcdoc
 }
 
 src_install() {
 	default
-	use doc && emake DESTDIR="${D}" install-srcdoc
+	#use doc && emake DESTDIR="${D}" install-srcdoc
 	find "${D}" -name '*.la' -type f -delete || die
 }