commit: a279f1807d70300d87948e766fbb86128bfe79fa Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Mon Jan 26 08:47:55 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Feb 11 02:55:57 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a279f180
app-text/xiphos: fix minizip-ng[compat] fix conflicting types for ‘in_func’ between zlib.h and zlib-ng.h used by minizip-ng[compat] Closes: https://bugs.gentoo.org/969182 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/45521 Closes: https://github.com/gentoo/gentoo/pull/45521 Signed-off-by: Sam James <sam <AT> gentoo.org> app-text/xiphos/files/xiphos-4.3.2-fix_minizip-ng.patch | 15 +++++++++++++++ app-text/xiphos/xiphos-4.3.2.ebuild | 6 ++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/app-text/xiphos/files/xiphos-4.3.2-fix_minizip-ng.patch b/app-text/xiphos/files/xiphos-4.3.2-fix_minizip-ng.patch new file mode 100644 index 000000000000..aaba35dad1c4 --- /dev/null +++ b/app-text/xiphos/files/xiphos-4.3.2-fix_minizip-ng.patch @@ -0,0 +1,15 @@ +see https://bugs.gentoo.org/969182 +PR merged https://github.com/crosswire/xiphos/pull/1264.patch +fix conflicting types for ‘in_func’ between zlib.h and zlib-ng.h used by minizip-ng[compat] +--- a/src/gtk/utilities.c ++++ b/src/gtk/utilities.c +@@ -38,8 +38,8 @@ + #include <gdk-pixbuf/gdk-pixbuf.h> + + #include <gtk/gtk.h> +-#include <minizip/zip.h> + #include <zlib.h> ++#include <minizip/zip.h> + + #include "gui/utilities.h" + #include "gui/preferences_dialog.h" diff --git a/app-text/xiphos/xiphos-4.3.2.ebuild b/app-text/xiphos/xiphos-4.3.2.ebuild index 1891c0901192..a69944afce04 100644 --- a/app-text/xiphos/xiphos-4.3.2.ebuild +++ b/app-text/xiphos/xiphos-4.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,15 +41,17 @@ BDEPEND=" " PATCHES=( - # both merged. to be removed at next version + # all merged. to be removed at next version "${FILESDIR}"/${PN}-4.3.2-include_dbus.patch "${FILESDIR}"/${PN}-4.3.2-fix_odr.patch + "${FILESDIR}"/${P}-fix_minizip-ng.patch #969182 ) src_prepare() { cmake_src_prepare # bug 964692, don't build translations for help-pages for now + # see https://github.com/crosswire/xiphos/issues/1253 echo "" > help/HELP_LINGUAS || die }
