From 0f987c63df533bed62b52d780d8e27e6e883aab9 Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings@gmail.com>
Date: Thu, 2 Apr 2020 23:17:32 -0500
Subject: [PATCH 1/2] Add fix_nasb.patch

---
 xiphos.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/xiphos.spec b/xiphos.spec
index faaeb76..b640b74 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,12 +1,14 @@
 Name:           xiphos
 Version:        4.1.0
-Release:        9%{?dist}
+Release:        12%{?dist}
 Summary:        Bible study and research tool
 License:        GPLv2+
 URL:            http://xiphos.org/
 Source0:        https://github.com/crosswire/%{name}/archive/%{version}.tar.gz
 # Generated from git by "git diff 4.1.0..fccfbdc until CMake is released upstream
 Patch0:         cmake.patch
+# Fetched from https://github.com/crosswire/xiphos/commit/670fac1eaac2f136c44082b109d2533d23f8c995.patch
+Patch1:         fix_nasb.patch
 BuildRequires:  biblesync-devel >= 2.0.1-3
 BuildRequires:  desktop-file-utils
 BuildRequires:  dbus-glib-devel
@@ -48,6 +50,7 @@ Project and elsewhere.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 rm -rf src/biblesync
 
 %build
@@ -103,6 +106,9 @@ rm -frv %{buildroot}%{_docdir}/%{name}
 %{_mandir}/man1/%{name}-nav.1.gz
 
 %changelog
+* Thu Apr 02 2020 Greg Hellings <greg.hellings@gmail.com> - 4.1.0-12
+- Added fix_nasb.patch
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 01a9aeff351c3a6871b0738f3cbf01232fbe0164 Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings@gmail.com>
Date: Thu, 2 Apr 2020 23:25:41 -0500
Subject: [PATCH 2/2] Actually add patch....

---
 fix_nasb.patch | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 fix_nasb.patch

diff --git a/fix_nasb.patch b/fix_nasb.patch
new file mode 100644
index 0000000..41b4814
--- /dev/null
+++ b/fix_nasb.patch
@@ -0,0 +1,72 @@
+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);