Upstream release 4.4.0 with TTS functions and editors again

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -19,3 +19,6 @@ xiphos-3.1.3.tar.gz
 /4.0.7.tar.gz
 /4.1.0.tar.gz
 /xiphos-4.2.1.tar.xz
+/xiphos-4.3.1.tar.xz
+/xiphos-4.3.2.tar.xz
+/xiphos-4.4.0.tar.xz

fix_nasb.patch

@@ -1,72 +0,0 @@
-From 670fac1eaac2f136c44082b109d2533d23f8c995 Mon Sep 17 00:00:00 2001
-From: Gregory Hellings <greg.hellings@gmail.com>
-Date: Thu, 2 Apr 2020 18:51:33 -0500
-Subject: [PATCH] Remove specific handling of NASB lexica
-
-Removes the handling of NASB lexica that was left from earlier plans to
-have NASHebrew and NASGreek as companion lexica for the NASB module.
-Since those do not exist and are certainly not force-installed, we
-should remove them from the code
----
- ChangeLog                  |  4 ++++
- src/main/module_dialogs.cc | 16 ++++------------
- src/main/url.cc            | 17 +++++------------
- 3 files changed, 13 insertions(+), 24 deletions(-)
-
-diff --git a/src/main/module_dialogs.cc b/src/main/module_dialogs.cc
-index 3590fdb9..fcc4fe09 100644
---- a/src/main/module_dialogs.cc
-+++ b/src/main/module_dialogs.cc
-@@ -1084,18 +1084,10 @@ static gint show_strongs(DIALOG_DATA *t, const gchar *type,
- {
- 	const gchar *modbuf = NULL;
- 
--	if (!strncmp(t->mod_name, "NASB", 4)) {
--		if (!strcmp(type, "Greek"))
--			modbuf = "NASGreek";
--		else
--			modbuf = "NASHebrew";
--
--	} else {
--		if (!strcmp(type, "Greek"))
--			modbuf = settings.lex_greek;
--		else if (!strcmp(type, "Hebrew"))
--			modbuf = settings.lex_hebrew;
--	}
-+	if (!strcmp(type, "Greek"))
-+		modbuf = settings.lex_greek;
-+	else if (!strcmp(type, "Hebrew"))
-+		modbuf = settings.lex_hebrew;
- 
- 	if (clicked) {
- 		static GtkWidget *dlg;
-diff --git a/src/main/url.cc b/src/main/url.cc
-index 0df5e97d..3c6d09e6 100644
---- a/src/main/url.cc
-+++ b/src/main/url.cc
-@@ -364,20 +364,13 @@ static gint show_strongs(const gchar *stype, const gchar *svalue,
- {
- 	const gchar *modbuf = NULL;
- 
--	if (!strncmp(settings.MainWindowModule, "NASB", 4)) {
-+	if (stype && (*stype != '\0')) {
- 		if (!strcmp(stype, "Greek"))
--			modbuf = "NASGreek";
-+			modbuf = settings.lex_greek;
- 		else
--			modbuf = "NASHebrew";
--	} else {
--		if (stype && (*stype != '\0')) {
--			if (!strcmp(stype, "Greek"))
--				modbuf = settings.lex_greek;
--			else
--				modbuf = settings.lex_hebrew;
--		} else
--			modbuf = "InvStrongsRealGreek";
--	}
-+			modbuf = settings.lex_hebrew;
-+	} else
-+		modbuf = "InvStrongsRealGreek";
- 
- 	if (clicked) {
- 		main_display_dictionary(modbuf, (gchar *)svalue);

sources

@@ -1 +1 @@
-SHA512 (xiphos-4.2.1.tar.xz) = 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe
+SHA512 (xiphos-4.4.0.tar.xz) = d5647c90a75897a03ef06219bb2773199bd44b83a79a0be74a378d57f8169c8919a989f43475c71e84e5cb1dfc23029f68ed6d51d7cd5f1837f737ea7e59ff49

xiphos.spec

@@ -1,10 +1,14 @@
+%undefine __cmake_in_source_build
+
 Name:           xiphos
-Version:        4.2.1
+Version:        4.4.0
 Release:        1%{?dist}
 Summary:        Bible study and research tool
-License:        GPLv2+
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
+License:        GPL-2.0-or-later
 URL:            http://xiphos.org/
 Source0:        https://github.com/crosswire/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
+BuildRequires:  appstream
 BuildRequires:  biblesync-devel >= 2.0.1-3
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -14,18 +18,18 @@ BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
 BuildRequires:  gtk3-devel
-BuildRequires:  gtkhtml3-devel
 BuildRequires:  intltool
 BuildRequires:  itstool
 BuildRequires:  libappstream-glib
-BuildRequires:  libglade2-devel
 BuildRequires:  libuuid-devel
-BuildRequires:  minizip-devel
+BuildRequires:  minizip-ng-compat-devel
 BuildRequires:  rarian-compat
+BuildRequires:  speech-dispatcher-devel
 BuildRequires:  sword-devel >= 1.8
 BuildRequires:  util-linux
-BuildRequires:  webkit2gtk3-devel
+BuildRequires:  webkit2gtk4.1-devel
 BuildRequires:  yelp-tools
+BuildRequires:  libzip-devel
 Requires:       yelp
 Obsoletes:      xiphos-gtk2 < 4.1
 Obsoletes:      xiphos-gtk3 < 4.1
@@ -55,20 +59,14 @@ export CXXFLAGS="$CXXFLAGS -fPIC"
 export CXXFLAGS
 export CFLAGS
 
-mkdir build
-pushd build
 LDFLAGS='%{?__global_ldflags}' \
-%cmake -DGTKHTML:BOOL=ON \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    ..
-
-%make_build
-popd
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DGTKTVEDITOR=ON \
+    %{nil}
+%cmake_build
 
 %install
-pushd build
-%make_install
-popd
+%cmake_install
 
 desktop-file-install --delete-original         \
     --add-category=X-Bible                     \
@@ -87,7 +85,7 @@ rm -frv %{buildroot}%{_docdir}/%{name}
 %license COPYING
 %{_bindir}/xiphos
 %{_bindir}/xiphos-nav
-%{_datadir}/appdata/xiphos.appdata.xml
+%{_datadir}/metainfo/xiphos.appdata.xml
 %{_datadir}/applications/xiphos.desktop
 %{_datadir}/icons/hicolor/scalable/apps/xiphos.svg
 %{_datadir}/xiphos/
@@ -99,6 +97,120 @@ rm -frv %{buildroot}%{_docdir}/%{name}
 %{_mandir}/man1/%{name}-nav.1.gz
 
 %changelog
+* Sun Aug 02 2026 Greg Hellings <greg.hellings@gmail.com> - 4.4.0-1
+- New upstream release 4.4.0
+- Introduction of speech services for TTS
+- Restoration of editor through GTK-native technologies
+
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Mon Jun 08 2026 František Zatloukal <fzatlouk@redhat.com> - 4.3.2-6
+- Rebuilt for icu 78.3
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Wed Aug 06 2025 František Zatloukal <fzatlouk@redhat.com> - 4.3.2-4
+- Rebuilt for icu 77.1
+
+* Sat Aug 2 2025 Aaron Rainbolt <arraybolt3@fedoraproject.org> - 4.3.2-3
+- Switch to webkitgtk4.1 since webkitgtk4.0 has been retired (rhbz#2385989)
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Jun 02 2025 Aaron Rainbolt <arraybolt3@gmail.com> - 4.3.2-1
+- New upstream version 4.3.2
+
+* Sun Mar 23 2025 Greg Hellings <greg.hellings@gmail.com> - 4.3.1-1
+- New upstream version 4.3.1 which already has editor fixed
+- Updated dependencies
+- Removed all patches
+
+* Wed Jan 29 2025 Aaron Rainbolt <arraybolt3@gmail.com> - 4.2.1-28
+- Strip out editor component to resolve FTBFS
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sun Dec 08 2024 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-26
+- Rebuild for ICU 76
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 4.2.1-25
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Feb 01 2024 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-23
+- Rebuild for ICU 74
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 04 2023 Lukas Javorsky <ljavorsk@redhat.com> - 4.2.1-21
+- Rebuilt for minizip-ng transition Fedora change
+- Fedora Change: https://fedoraproject.org/wiki/Changes/MinizipNGTransition
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 František Zatloukal <fzatlouk@redhat.com> - 4.2.1-19
+- Rebuilt for ICU 73.2
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-17
+- Rebuild for ICU 72
+
+* Tue Nov 15 2022 Sandro Mani <manisandro@gmail.com> - 4.2.1-16
+- Rebuild (minizip-ng)
+
+* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 4.2.1-15
+- Rebuilt for ICU 71.1
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Mar 18 2022 Greg Hellings <greg.hellings@gmail.com> - 4.2.1-13
+- Add minizip patch to fix FTBFS
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-10
+- Rebuild for ICU 69
+
+* Thu Apr 22 2021 Greg Hellings <greg.hellings@gmail.com> - 4.2.1-9
+- Added patch for glib version incompatibility
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Dec 14 2020 Greg Hellings <greg.hellings@gmail.com> - 4.2.1-7
+- Force rebuild against SWORD 1.9.0
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-6
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jun 11 2020 Greg Hellings <greg.hellings@gmail.com> - 4.2.1-4
+- Remove libglade2 from BR
+
+* Sun May 17 2020 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-3
+- Rebuild for ICU 67
+
+* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 4.2.1-2
+- Rebuild for ICU 67
+
 * Thu May 14 2020 Greg Hellings <greg.hellings@gmail.com> - 4.2.1-1
 - Upstream release 4.2.1
 - Remove patches