app-text/xiphos: add 4.3.2

license :
keep GPL2 (main) and MIT (some files)
there are no traces of the others

deps :
move building-tools to BDEPENDS
remove sys-apps/util-linux, not required
add gdk-pixbuf

patches :
those of 4.2.1 are no longer required
new to fix dbus include/link
new to fix LTO/ODR

Bug: https://bugs.gentoo.org/924628
Closes: https://bugs.gentoo.org/959353
Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/42844
Closes: https://github.com/gentoo/gentoo/pull/42844
Signed-off-by: Sam James <sam@gentoo.org>

app-text/xiphos/Manifest

@@ -1,2 +1,3 @@
 DIST xiphos-4.2.1-disable_webkit_editor.patch.xz 7432 BLAKE2B b1dd9db675a34433f4979247d57936920e178cf83cbcfa0fc2a4b9491855d064ecccdb8805a5615b9c91490c3ff2c24f7d951dad009e83952e5d6aa28c8a0730 SHA512 ae0d9b526143445529fa467bdd1b90015812a5d81396619e64a701962a608413c5875c137970d2b70dbac28085e7f40dc6049d591efaf96df7ddfb2cc64854da
 DIST xiphos-4.2.1.tar.xz 21586484 BLAKE2B 7529f770766dfc5bae6cb04bfeb3d3cc0714c4ebbd2282aca549e50b8a9ca4c74cdb8cb69667f1036ee33ee1c5d90e562cff80d520ce72651736e1f5f4274ba1 SHA512 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe
+DIST xiphos-4.3.2.tar.xz 21383548 BLAKE2B faf5d830bfddfb531ca24c9073f54a9405dd256e2c23c211e4e1c91027d00ea61928214d7da61244097f0327ee50769e5b27ef78f3d242a8640e2a6ec2c67ddc SHA512 b954a5c2d34defc6d472341d612a6dd53eabc3801091c2cbb81c567d6fcc55545a63425f6e22a3649f4436aa4ab9a7cacf91a8630d41224782b62d59b41f5fe4

app-text/xiphos/files/xiphos-4.3.2-fix_odr.patch

@@ -0,0 +1,36 @@
+Fix lto. Merged in upstream
+https://github.com/crosswire/xiphos/commit/9435cdce8ec64f4eb699b0cd7b66df02949fe5fb.patch
+From 9435cdce8ec64f4eb699b0cd7b66df02949fe5fb Mon Sep 17 00:00:00 2001
+From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+Date: Wed, 2 Jul 2025 15:52:24 +0200
+Subject: [PATCH] fix One Definition Rule violations (#1242)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+>xiphos-4.3.2/src/main/parallel_view.cc:86:15:
+>error: ‘no_content’ violates the C++ One Definition Rule [-Werror=odr]
+>   86 | extern gchar *no_content;
+>      |               ^
+>xiphos-4.3.2/src/main/display.cc:88:14: note: ‘no_content’ was previously declared here
+>   88 | const gchar *no_content =
+>      |              ^
+
+Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+---
+ src/main/parallel_view.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/parallel_view.cc b/src/main/parallel_view.cc
+index 39b8037e2..22164d1c8 100644
+--- a/src/main/parallel_view.cc
++++ b/src/main/parallel_view.cc
+@@ -83,7 +83,7 @@ SWBuf unknown_parallel = _("Unknown parallel module: ");
+  */
+ 
+ BackEnd *backend_p;
+-extern gchar *no_content;
++extern const gchar *no_content;
+ 
+ static const gchar *tf2of(int true_false)
+ {

app-text/xiphos/files/xiphos-4.3.2-include_dbus.patch

@@ -0,0 +1,24 @@
+https://github.com/crosswire/xiphos/pull/1103.patch
+dbus is not called for the main target, but it should.
+diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
+index 4952757..a65a92b 100644
+--- a/src/main/CMakeLists.txt
++++ b/src/main/CMakeLists.txt
+@@ -77,6 +77,17 @@ target_link_libraries(main
+   PkgConfig::Biblesync
+   )
+ 
++IF (DBUS)
++  target_include_directories (main
++    PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
++    PkgConfig::DBus
++    )
++  target_link_libraries(main
++    PRIVATE
++    PkgConfig::DBus
++    )
++ENDIF (DBUS)
++
+ if(WK_FOUND)
+   target_compile_definitions(main
+     PRIVATE

app-text/xiphos/xiphos-4.3.2.ebuild

@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake eapi9-ver xdg
+
+DESCRIPTION="Gtk+-based Bible-study frontend for SWORD"
+HOMEPAGE="https://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+RDEPEND="
+	app-text/sword
+	dev-libs/glib:2
+	dev-libs/icu:=
+	dev-libs/libxml2:=
+	net-libs/biblesync
+	net-libs/webkit-gtk:4.1
+	sys-libs/zlib[minizip]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	app-arch/zip
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.2-include_dbus.patch
+	# merged. to be removed at next version
+	"${FILESDIR}"/${PN}-4.3.2-fix_odr.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DDBUS=$(usex dbus)
+		-DDEBUG=$(usex debug)
+		-DPOSTINST=off
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	# see https://github.com/crosswire/xiphos/blob/4.3.2/src/editor/webkit_editor.c#L28
+	if ver_replacing -le "4.2.1"; then
+		ewarn "Please note that ${PN} no longer provides an editor due to its dependency on outdated libraries."
+		ewarn "Studypad and the personal commentary will no longer work."
+	fi
+}