Merge a91f8770f4 into 178ece01b6

srcpkgs/xiphos/patches/https-by-default.patch

@@ -0,0 +1,28 @@
+commit a6bf0fe8d243bb7637410985dac6dfee42f56ff7
+Author: T.J. Townsend <blakkheim@archlinux.org>
+Date:   Sun Oct 9 22:51:53 2022 -0400
+
+    Fetch modules over HTTPS instead of FTP by default.
+
+diff --git a/src/backend/module_manager.cc b/src/backend/module_manager.cc
+index 1b53a601..b0b3b0e0 100644
+--- a/src/backend/module_manager.cc
++++ b/src/backend/module_manager.cc
+@@ -554,13 +554,13 @@ void backend_init_module_mgr_config(void)
+ 
+ 	SWConfig config(confPath.c_str());
+ 
+-	InstallSource is("FTP");
++	InstallSource is("HTTPS");
+ 	is.caption = "CrossWire";
+-	is.source = "ftp.crosswire.org";
+-	is.directory = "/pub/sword/raw";
++	is.source = "www.crosswire.org";
++	is.directory = "/ftpmirror/pub/sword/raw";
+ 
+ 	config["General"]["PassiveFTP"] = "true";
+-	config["Sources"]["FTPSource"] = is.getConfEnt();
++	config["Sources"]["HTTPSSource"] = is.getConfEnt();
+ 	config.save();
+ 
+ 	InstallSource is_local("DIR");

srcpkgs/xiphos/template

@@ -0,0 +1,17 @@
+# Template file for 'xiphos'
+pkgname=xiphos
+version=4.3.1
+revision=1
+build_style=cmake
+hostmakedepends="appstream-glib dbus-glib-devel desktop-file-utils gettext
+ glib-devel libxml2-python3 pkg-config python3-lxml util-linux yelp-tools zip"
+makedepends="biblesync-devel dbus-glib-devel gtk+3-devel icu-devel intltool
+ itstool libffi libsoup3-devel libwebkit2gtk41-devel libxml2 libxslt
+ minizip-devel sword-devel zlib"
+depends="biblesync dbus-glib icu icu-libs minizip sword libwebkit2gtk41"
+short_desc="GTK3 Bible tool for reading, study, and research"
+maintainer="Samuel Allan <samuelengineer@fastmail.com>"
+license="GPL-2.0-only"
+homepage="https://xiphos.org/"
+distfiles="https://github.com/crosswire/xiphos/archive/refs/tags/${version}.tar.gz"
+checksum=6ff5f94b50b5fc4c0018a19886fb246e4589400a3d49826cdbebc66c917b8d54