[PR PATCH] sword build shared lib

[PR PATCH] sword build shared lib

[sgn]

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages sword-shared-lib
https://github.com/void-linux/void-packages/pull/28557

sword build shared lib
@fosslinux Please help to check. I'm not sure if build shared lib is the right choice.
However, this will remove shlibs-requires from bibletime to icu, thus reduce the number of rebuild when updating icu.

A patch file from https://github.com/void-linux/void-packages/pull/28557.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-sword-shared-lib-28557.patch --]
[-- Type: text/x-diff, Size: 3175 bytes --]

From a3959d8dcf8879a828a8c91d86d39a4382f4b542 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Feb 2021 07:06:31 +0700
Subject: [PATCH 1/2] sword: build shared lib

---
 common/shlibs          |  1 +
 srcpkgs/libsword       |  1 +
 srcpkgs/sword/template | 19 ++++++++++++-------
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 120000 srcpkgs/libsword

diff --git a/common/shlibs b/common/shlibs
index 9c7ca7b2c51..31ddb8abff5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3981,3 +3981,4 @@ libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
 libpamtest.so.0 pam_wrapper-1.1.3_1
 libopenaptx.so.0 libopenaptx-0.2.0_1
+libsword-1.8.1.so libsword-1.8.1_6
diff --git a/srcpkgs/libsword b/srcpkgs/libsword
new file mode 120000
index 00000000000..fec9ffa97fe
--- /dev/null
+++ b/srcpkgs/libsword
@@ -0,0 +1 @@
+sword
\ No newline at end of file
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index bb2999aa0ed..13240a99316 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,16 +1,14 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=5
+revision=6
 build_style=gnu-configure
-configure_args="--prefix=/usr --libdir=/usr/lib --without-conf
- --disable-shared --with-icuregex"
+configure_args="--without-conf --with-icuregex"
 hostmakedepends="libtool automake pkg-config"
 makedepends="icu-devel clucene-devel libcurl-devel zlib-devel"
-conf_files="/etc/sword.conf"
 short_desc="CrossWire Bible Society's free Bible software project"
 maintainer="Dan Arnfield <dan@arnfield.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://crosswire.org/sword/index.jsp"
 distfiles="https://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-${version}.tar.gz"
 checksum=ce9aa8f721a737f406115d35ff438bd07c829fce1605f0d6dcdabc4318bc5e93
@@ -21,8 +19,14 @@ pre_configure() {
 	./autogen.sh
 }
 
-post_install() {
-	vconf ${FILESDIR}/sword.conf
+libsword_package() {
+	conf_files="/etc/sword.conf"
+	short_desc+=" - libraries"
+	pkg_install() {
+		vconf ${FILESDIR}/sword.conf
+		vmove "usr/lib/libsword-*.so"
+		vmove usr/share
+	}
 }
 
 sword-devel_package() {
@@ -32,5 +36,6 @@ sword-devel_package() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/libsword.so"
 	}
 }

From ac1d1dd02284e1c692f6925cdc89659f846d1661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 7 Feb 2021 07:49:18 +0700
Subject: [PATCH 2/2] bibletime: rebuild with shared sword

---
 srcpkgs/bibletime/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template
index 5551952adaa..224881c4551 100644
--- a/srcpkgs/bibletime/template
+++ b/srcpkgs/bibletime/template
@@ -4,7 +4,7 @@
 # to start.
 pkgname=bibletime
 version=3.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=/usr/share/xsl/docbook/html/chunk.xsl
  -DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=/usr/share/xsl/docbook/fo/docbook.xsl"

Re: sword build shared lib

[fosslinux]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/28557#issuecomment-774574131

Comment:
I think this is fine, but I will build and test that the software works correctly.

Re: sword build shared lib

[sgn]

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28557#issuecomment-779942349

Comment:
@fosslinux ping

Re: [PR PATCH] [Merged]: sword build shared lib

[sgn]

[-- Attachment #1: Type: text/plain, Size: 385 bytes --]

There's a merged pull request on the void-packages repository

sword build shared lib
https://github.com/void-linux/void-packages/pull/28557

Description:
@fosslinux Please help to check (as I'm not Christian).
I'm not sure if build shared lib is the right choice.
However, this will remove shlibs-requires from bibletime to icu, thus reduce the number of rebuild when updating icu.