Re: [PR PATCH] [Updated] gnucash: update to 5.3, enable SQL support + add libdbi packages

[cinerea0 <cinerea0@users.noreply.github.com>]

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

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages gnucash
https://github.com/void-linux/void-packages/pull/43386

gnucash: update to 5.3, enable SQL support + add libdbi packages
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- These new packages conform to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc (crossbuilds disabled for gnucash)

---

**cc: @manfredu**


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gnucash-43386.patch --]
[-- Type: text/x-diff, Size: 9045 bytes --]

From 2e3eef59ade2956ad637012eda814eed6fe30fc5 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 6 Aug 2023 14:56:13 -0400
Subject: [PATCH 1/3] New package: libdbi-0.9.0

---
 common/shlibs           |  1 +
 srcpkgs/libdbi-devel    |  1 +
 srcpkgs/libdbi-doc      |  1 +
 srcpkgs/libdbi/template | 31 +++++++++++++++++++++++++++++++
 4 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libdbi-devel
 create mode 120000 srcpkgs/libdbi-doc
 create mode 100644 srcpkgs/libdbi/template

diff --git a/common/shlibs b/common/shlibs
index ddb0e8ab87091..2564c36a5ed2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4327,3 +4327,4 @@ libvmaf.so.1 vmaf-2.3.1_1
 liblc3.so.1 liblc3-1.0.3_1
 libmimalloc.so.2 mimalloc-2.1.2_1
 lib2geom.so.1.3.0 lib2geom-1.3_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 0000000000000..461034ca75ea7
--- /dev/null
+++ b/srcpkgs/libdbi-devel
@@ -0,0 +1 @@
+libdbi
\ No newline at end of file
diff --git a/srcpkgs/libdbi-doc b/srcpkgs/libdbi-doc
new file mode 120000
index 0000000000000..461034ca75ea7
--- /dev/null
+++ b/srcpkgs/libdbi-doc
@@ -0,0 +1 @@
+libdbi
\ No newline at end of file
diff --git a/srcpkgs/libdbi/template b/srcpkgs/libdbi/template
new file mode 100644
index 0000000000000..dcdaf1cf19a8e
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,31 @@
+# Template file for 'libdbi'
+pkgname=libdbi
+version=0.9.0
+revision=1
+build_style=gnu-configure
+short_desc="Database independent abstraction layer for C"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="LGPL-2.1-only"
+homepage="https://libdbi.sourceforge.net/"
+changelog="https://sourceforge.net/p/libdbi/libdbi/ci/master/tree/NEWS"
+distfiles="${SOURCEFORGE_SITE}/libdbi/libdbi-${version}.tar.gz"
+checksum=dafb6cdca524c628df832b6dd0bf8fabceb103248edb21762c02d3068fca4503
+
+libdbi-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From c032a2a2facc5c79569b729378ffd2aa6577ac82 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 6 Aug 2023 14:56:42 -0400
Subject: [PATCH 2/3] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbdmysql             |  1 +
 srcpkgs/libdbdpgsql             |  1 +
 srcpkgs/libdbdsqlite            |  1 +
 srcpkgs/libdbi-drivers-devel    |  1 +
 srcpkgs/libdbi-drivers/template | 56 +++++++++++++++++++++++++++++++++
 5 files changed, 60 insertions(+)
 create mode 120000 srcpkgs/libdbdmysql
 create mode 120000 srcpkgs/libdbdpgsql
 create mode 120000 srcpkgs/libdbdsqlite
 create mode 120000 srcpkgs/libdbi-drivers-devel
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 0000000000000..28d3bc25c5fcb
--- /dev/null
+++ b/srcpkgs/libdbdmysql
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbdpgsql b/srcpkgs/libdbdpgsql
new file mode 120000
index 0000000000000..28d3bc25c5fcb
--- /dev/null
+++ b/srcpkgs/libdbdpgsql
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbdsqlite b/srcpkgs/libdbdsqlite
new file mode 120000
index 0000000000000..28d3bc25c5fcb
--- /dev/null
+++ b/srcpkgs/libdbdsqlite
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-devel b/srcpkgs/libdbi-drivers-devel
new file mode 120000
index 0000000000000..28d3bc25c5fcb
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers/template b/srcpkgs/libdbi-drivers/template
new file mode 100644
index 0000000000000..fcf56b63decde
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,56 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-mysql --with-pgsql --with-sqlite3"
+hostmakedepends="automake docbook docbook-dsssl libtool openjade
+ postgresql-libs-devel"
+makedepends="libdbi-devel libmariadbclient-devel postgresql-libs-devel
+ sqlite-devel zlib-devel"
+depends="libdbdmysql libdbdpgsql libdbdsqlite"
+short_desc="Database drivers for libdbi (MySQL, PostgreSQL, and SQLite)"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
+license="LGPL-2.1-only"
+homepage="https://libdbi-drivers.sourceforge.net/"
+changelog="https://sourceforge.net/p/libdbi-drivers/libdbi-drivers/ci/master/tree/NEWS"
+distfiles="${SOURCEFORGE_SITE}/libdbi-drivers/libdbi-drivers-${version}.tar.gz"
+checksum=43d2eacd573a4faff296fa925dd97fbf2aedbf1ae35c6263478210c61004c854
+make_check=no  # tests require full DB environments and hang
+
+if [ "${CROSS_BUILD}" ]; then
+	configure_args+=" --with-dbi-libdir=${XBPS_CROSS_BASE}/usr/lib"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
+
+libdbdmysql_package() {
+	short_desc="MySQL driver for libdbi"
+	pkg_install() {
+		vmove usr/lib/dbd/libdbdmysql.so
+	}
+}
+
+libdbdpgsql_package() {
+	short_desc="PostgreSQL driver for libdbi"
+	pkg_install() {
+		vmove usr/lib/dbd/libdbdpgsql.so
+	}
+}
+
+libdbdsqlite_package() {
+	short_desc="SQLite driver for libdbi"
+	pkg_install() {
+		vmove usr/lib/dbd/libdbdsqlite3.so
+	}
+}
+
+libdbi-drivers-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/dbd/*.a"
+	}
+}

From 078d68ce19667a6ded1eb724a10159e344b92ad4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 6 Aug 2023 14:57:20 -0400
Subject: [PATCH 3/3] gnucash: update to 5.3, enable SQL backends

---
 srcpkgs/gnucash/files/README.voidlinux |  9 ++++++++
 srcpkgs/gnucash/template               | 32 +++++++++++++++-----------
 2 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/gnucash/files/README.voidlinux

diff --git a/srcpkgs/gnucash/files/README.voidlinux b/srcpkgs/gnucash/files/README.voidlinux
new file mode 100644
index 0000000000000..6ed12f90109d2
--- /dev/null
+++ b/srcpkgs/gnucash/files/README.voidlinux
@@ -0,0 +1,9 @@
+To use the SQL backend(s) you must install the appropriate driver:
+
+SQL Backend		Package
+-----------		-------
+MySQL			libdbdmysql
+PostgreSQL		libdbdpgsql
+SQLite			libdbdsqlite
+
+You can also install all of the above with libdbi-drivers.
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 7dec427303322..fc6275c77eb96 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,21 +1,23 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=4.13
-revision=4
+version=5.3
+revision=1
 build_style=cmake
 make_check_target=check
-configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
+configure_args="-DWITH_PYTHON=1 -DCOMPILE_GSCHEMAS=OFF"
 hostmakedepends="pkg-config guile python3 libxslt perl gettext swig"
 makedepends="aqbanking-devel icu-devel boost-devel gc-devel glib-devel gtest-devel guile-devel
  gwenhywfar-devel ktoblzcheck-devel libofx-devel libsecret-devel
- libxslt-devel webkit2gtk-devel python3-devel gwenhywfar-gtk3 tzdata"
+ libxslt-devel webkit2gtk-devel python3-devel gwenhywfar-gtk3 tzdata
+ libdbi-devel libdbi-drivers-devel"
 depends="dconf guile perl"
 short_desc="Financial-accounting software"
 maintainer="ManfredU <mu@usselmann.it>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnucash.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=401a158086635ea17fbb145325558537289aa1d24d022f7c3317e12f3dabd8e7
+changelog="https://raw.githubusercontent.com/Gnucash/gnucash/stable/NEWS"
+distfiles="https://github.com/Gnucash/gnucash/releases/download/${version}/gnucash-${version}.tar.gz"
+checksum=e0d04e0fd5f03f39136e1f4d941ccd0202b64a6e92418f5382cb6a6772493529
 
 pycompile_dirs="usr/share/gnucash/python"
 conf_files="/etc/gnucash/environment"
@@ -30,14 +32,16 @@ if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 fi
 
 post_install() {
-	case "$XBPS_TARGET_MACHINE" in
-		# startup fails in scheme code when the locale is set to anything
-		# else on musl
-		*-musl) sed -i -e 's/Exec=gnucash/Exec=env LANG=C gnucash/' \
-			${DESTDIR}/usr/share/applications/gnucash.desktop
-			;;
-	esac
-	rm -f "${DESTDIR}/usr/share/glib-2.0/schemas/gschemas.compiled"
+	vdoc "${FILESDIR}/README.voidlinux"
+	# startup fails in scheme code when the locale is set to anything else on musl
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		vsed -i ${DESTDIR}/usr/share/applications/gnucash.desktop \
+			-e 's/Exec=gnucash/Exec=env LANG=C gnucash/'
+	fi
+	# Delete the gnucash-valgrind executable because the source files
+	# are not included with the package and the executable is hardlinked
+	# to the location that it was built at.
+	rm -f "${DESTDIR}/usr/bin/gnucash-valgrind"
 }
 
 gnucash-devel_package() {