Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages
@ 2023-04-11  3:52 cinerea0
  2023-04-11  4:00 ` cinerea0
                   ` (25 more replies)
  0 siblings, 26 replies; 27+ messages in thread
From: cinerea0 @ 2023-04-11  3:52 UTC (permalink / raw)
  To: ml

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

There is a new 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.0, 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: 7409 bytes --]

From 13a8b525b8edbad2e9b0de82c4b453404824ead0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 10 Apr 2023 23:39:54 -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 | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 39fed5ffbcf5..8957268230ac 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4243,3 +4243,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From c2eaa2b260b030e8a2d186d641d1c394e0d1695a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 10 Apr 2023 23:40:26 -0400
Subject: [PATCH 2/3] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbi-drivers-devel    |  1 +
 srcpkgs/libdbi-drivers-doc      |  1 +
 srcpkgs/libdbi-drivers/template | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libdbi-drivers-devel
 create mode 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbi-drivers-devel b/srcpkgs/libdbi-drivers-devel
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..add0f8977175
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,33 @@
+# 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="docbook docbook-dsssl openjade"
+makedepends="libdbi-devel libmariadbclient-devel postgresql-libs-devel
+ sqlite-devel zlib-devel"
+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
+
+libdbi-drivers-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/dbd/*.a"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From d92b7f3c5827b5f7a83bf758d3cfc245399a1c65 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 10 Apr 2023 23:42:23 -0400
Subject: [PATCH 3/3] gnucash: update to 5.0, enable SQL support

---
 srcpkgs/gnucash/template | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 3b3d1a4390e2..d0058b35f7d1 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,21 +1,23 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=4.13
-revision=2
+version=5.0
+revision=1
 build_style=cmake
 make_check_target=check
-configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
-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"
-depends="dconf guile perl"
+configure_args="-DWITH_PYTHON=1"
+hostmakedepends="gettext guile libxslt perl pkg-config python3 swig"
+makedepends="aqbanking-devel boost-devel gc-devel glib-devel gtest-devel
+ guile-devel gwenhywfar-devel gwenhywfar-gtk3 icu-devel ktoblzcheck-devel
+ libdbi-devel libdbi-drivers-devel libofx-devel libsecret-devel libxslt-devel
+ python3-devel tzdata webkit2gtk-devel"
+depends="dconf guile libdbi-drivers 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="${SOURCEFORGE_SITE}/gnucash/gnucash-${version}.tar.bz2"
+checksum=cfc13bab31aed8e4962805ef56530f9772889604910b5678cb5c79c283138824
 
 pycompile_dirs="usr/share/gnucash/python"
 conf_files="/etc/gnucash/environment"
@@ -30,13 +32,11 @@ 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
+	# 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
 	rm -f "${DESTDIR}/usr/share/glib-2.0/schemas/gschemas.compiled"
 }
 

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
@ 2023-04-11  4:00 ` cinerea0
  2023-04-11  4:14 ` [PR PATCH] [Updated] " cinerea0
                   ` (24 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-04-11  4:00 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/43386#issuecomment-1502654316

Comment:
A few things I wanted to point out:
* `gnucash`'s changelog is hosted on GitHub along with a mirror of its source code. That repo also hosts the same release tarballs that are hosted on SourceForge, so the distfiles could be set to that instead if we wanted to move away from SourceForge.
* The reason I split `libdbi` and `libdbi-drivers` as much as I did is because the docs subpackages are larger and have far more files than the base packages, and they contain information only relevant to developers.
* I added `libdbi-drivers` as a dependency to `gnucash` because, while it isn't required for basic functionality, you can't use the SQL backends without it.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
  2023-04-11  4:00 ` cinerea0
@ 2023-04-11  4:14 ` cinerea0
  2023-04-11  4:48 ` sgn
                   ` (23 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-04-11  4:14 UTC (permalink / raw)
  To: ml

[-- 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.0, 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: 7431 bytes --]

From 13a8b525b8edbad2e9b0de82c4b453404824ead0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 10 Apr 2023 23:39:54 -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 | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 39fed5ffbcf5..8957268230ac 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4243,3 +4243,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From 462afa851c0faf909145dd2dbdcc2249c3690fb9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 11 Apr 2023 00:13:19 -0400
Subject: [PATCH 2/3] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbi-drivers-devel    |  1 +
 srcpkgs/libdbi-drivers-doc      |  1 +
 srcpkgs/libdbi-drivers/template | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libdbi-drivers-devel
 create mode 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbi-drivers-devel b/srcpkgs/libdbi-drivers-devel
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..074e1b86f852
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,33 @@
+# 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="docbook docbook-dsssl openjade postgresql-libs-devel"
+makedepends="libdbi-devel libmariadbclient-devel postgresql-libs-devel
+ sqlite-devel zlib-devel"
+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
+
+libdbi-drivers-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/dbd/*.a"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From 307f02d04a34ab3589ac764c862587a578846b10 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 11 Apr 2023 00:13:47 -0400
Subject: [PATCH 3/3] gnucash: update to 5.0, enable SQL support

---
 srcpkgs/gnucash/template | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 3b3d1a4390e2..d0058b35f7d1 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,21 +1,23 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=4.13
-revision=2
+version=5.0
+revision=1
 build_style=cmake
 make_check_target=check
-configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
-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"
-depends="dconf guile perl"
+configure_args="-DWITH_PYTHON=1"
+hostmakedepends="gettext guile libxslt perl pkg-config python3 swig"
+makedepends="aqbanking-devel boost-devel gc-devel glib-devel gtest-devel
+ guile-devel gwenhywfar-devel gwenhywfar-gtk3 icu-devel ktoblzcheck-devel
+ libdbi-devel libdbi-drivers-devel libofx-devel libsecret-devel libxslt-devel
+ python3-devel tzdata webkit2gtk-devel"
+depends="dconf guile libdbi-drivers 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="${SOURCEFORGE_SITE}/gnucash/gnucash-${version}.tar.bz2"
+checksum=cfc13bab31aed8e4962805ef56530f9772889604910b5678cb5c79c283138824
 
 pycompile_dirs="usr/share/gnucash/python"
 conf_files="/etc/gnucash/environment"
@@ -30,13 +32,11 @@ 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
+	# 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
 	rm -f "${DESTDIR}/usr/share/glib-2.0/schemas/gschemas.compiled"
 }
 

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
  2023-04-11  4:00 ` cinerea0
  2023-04-11  4:14 ` [PR PATCH] [Updated] " cinerea0
@ 2023-04-11  4:48 ` sgn
  2023-04-11  5:20 ` cinerea0
                   ` (22 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2023-04-11  4:48 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/43386#issuecomment-1502682878

Comment:
I think it's better to split those 3 files into 3 packages:
```
/usr/lib/dbd/libdbdmysql.so
/usr/lib/dbd/libdbdpgsql.so
/usr/lib/dbd/libdbdsqlite3.so
```

Those files isn't that big itself, but I guess they will pull libmariaclient and libpgsql in which is big (I guess).

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (2 preceding siblings ...)
  2023-04-11  4:48 ` sgn
@ 2023-04-11  5:20 ` cinerea0
  2023-04-11 14:30 ` sgn
                   ` (21 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-04-11  5:20 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/43386#issuecomment-1502703390

Comment:
> I think it's better to split those 3 files into 3 packages

In addition to or instead of the current splits?

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (3 preceding siblings ...)
  2023-04-11  5:20 ` cinerea0
@ 2023-04-11 14:30 ` sgn
  2023-04-11 18:17 ` cinerea0
                   ` (20 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2023-04-11 14:30 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/43386#issuecomment-1503477814

Comment:
> > I think it's better to split those 3 files into 3 packages
> 
> In addition to or instead of the current splits?

In addition to current split.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (4 preceding siblings ...)
  2023-04-11 14:30 ` sgn
@ 2023-04-11 18:17 ` cinerea0
  2023-04-12  4:59 ` sgn
                   ` (19 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-04-11 18:17 UTC (permalink / raw)
  To: ml

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

New comment by cinerea0 on void-packages repository

https://github.com/void-linux/void-packages/pull/43386#issuecomment-1503875377

Comment:
Moving each library out into its own package results in the main package being empty. Taking the trick from `mpg123-extras` and installing the readme as documentation doesn't work because all of the documentation is moved into `libdbi-drivers-doc`. Is there an another workaround?

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (5 preceding siblings ...)
  2023-04-11 18:17 ` cinerea0
@ 2023-04-12  4:59 ` sgn
  2023-04-12 17:23 ` [PR PATCH] [Updated] " cinerea0
                   ` (18 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: sgn @ 2023-04-12  4:59 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/43386#issuecomment-1504625777

Comment:
`build_style=meta`, I would say, or let `sqlite3`, which is the lite version stay in main package.

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (6 preceding siblings ...)
  2023-04-12  4:59 ` sgn
@ 2023-04-12 17:23 ` cinerea0
  2023-04-12 18:14 ` cinerea0
                   ` (17 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-04-12 17:23 UTC (permalink / raw)
  To: ml

[-- 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.0, 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: 10843 bytes --]

From 52c32a8357729ccc6f5454eec70b63a40396f659 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 12 Apr 2023 13:21:08 -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 | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 847f5daec09d..dde96bd527bb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4243,3 +4243,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From e61f46aa4d516bf5103f85e81b93ce6e3215ca01 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 12 Apr 2023 13:21:41 -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-doc      |  1 +
 srcpkgs/libdbi-drivers/template | 98 +++++++++++++++++++++++++++++++++
 6 files changed, 103 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 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..cd8534e3a874
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,98 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --with-mysql --with-pgsql --with-sqlite3
+ --with-dbi-libdir=${XBPS_CROSS_BASE}/usr/lib"
+hostmakedepends="docbook docbook-dsssl 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
+
+# build_style is meta because subpackages move all files out of the main
+# package, so build steps must be directly included. do_configure through
+# do_install are taken directly from common/build-style/gnu-configure.sh.
+do_configure() {
+	: ${configure_script:=./configure}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${configure_script} ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=make}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+		if make -q check 2>/dev/null; then
+			:
+		else
+			if [ $? -eq 2 ]; then
+				msg_warn 'No target to "make check".\n'
+				return 0
+			fi
+		fi
+	fi
+
+	: ${make_cmd:=make}
+	: ${make_check_target:=check}
+
+	${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
+
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+}
+
+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"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From a2a31e0cbcc197ce7fb7bfbf3b1ba3a70b5bf790 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 12 Apr 2023 13:23:20 -0400
Subject: [PATCH 3/3] gnucash: update to 5.0, enable SQL support

---
 srcpkgs/gnucash/files/README.voidlinux |  9 ++++++
 srcpkgs/gnucash/template               | 38 ++++++++++++++------------
 2 files changed, 30 insertions(+), 17 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 000000000000..3f48d63b07fc
--- /dev/null
+++ b/srcpkgs/gnucash/files/README.voidlinux
@@ -0,0 +1,9 @@
+Installing GnuCash does not provide the libraries necessary to use its SQL
+backend. Install the following packages to enable their corresponding SQL
+backends:
+
+libdbdmysql		MySQL
+libdbdpgsql		PostgreSQL
+libdbdsqlite	SQLite
+
+To install all of the above, install libdbi-drivers.
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 3b3d1a4390e2..06bb934ac8ac 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,21 +1,23 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=4.13
-revision=2
+version=5.0
+revision=1
 build_style=cmake
 make_check_target=check
-configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
-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"
+configure_args="-DWITH_PYTHON=1 -DCOMPILE_GSCHEMAS=0"
+hostmakedepends="gettext guile libxslt perl pkg-config python3 swig"
+makedepends="aqbanking-devel boost-devel gc-devel glib-devel gtest-devel
+ guile-devel gwenhywfar-devel gwenhywfar-gtk3 icu-devel ktoblzcheck-devel
+ libdbi-devel libdbi-drivers-devel libofx-devel libsecret-devel libxslt-devel
+ python3-devel tzdata webkit2gtk-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="${SOURCEFORGE_SITE}/gnucash/gnucash-${version}.tar.bz2"
+checksum=cfc13bab31aed8e4962805ef56530f9772889604910b5678cb5c79c283138824
 
 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() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (7 preceding siblings ...)
  2023-04-12 17:23 ` [PR PATCH] [Updated] " cinerea0
@ 2023-04-12 18:14 ` cinerea0
  2023-04-14  1:58 ` cinerea0
                   ` (16 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-04-12 18:14 UTC (permalink / raw)
  To: ml

[-- 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.0, 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: 10935 bytes --]

From 52c32a8357729ccc6f5454eec70b63a40396f659 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 12 Apr 2023 13:21:08 -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 | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 847f5daec09d..dde96bd527bb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4243,3 +4243,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From 1d8a8e1ce1b05659f725903a40d97eba2624358b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 12 Apr 2023 14:14:00 -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-doc      |   1 +
 srcpkgs/libdbi-drivers/template | 102 ++++++++++++++++++++++++++++++++
 6 files changed, 107 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 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..12f062aa350a
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,102 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --with-mysql --with-pgsql --with-sqlite3"
+hostmakedepends="docbook docbook-dsssl 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
+	 --host=${XBPS_CROSS_TRIPLET}"
+fi
+
+# build_style is meta because subpackages move all files out of the main
+# package, so build steps must be directly included. do_configure through
+# do_install are taken directly from common/build-style/gnu-configure.sh.
+do_configure() {
+	: ${configure_script:=./configure}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${configure_script} ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=make}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+		if make -q check 2>/dev/null; then
+			:
+		else
+			if [ $? -eq 2 ]; then
+				msg_warn 'No target to "make check".\n'
+				return 0
+			fi
+		fi
+	fi
+
+	: ${make_cmd:=make}
+	: ${make_check_target:=check}
+
+	${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
+
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+}
+
+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"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From d3ea66b20444fa947c4938c5b140f7e77a28e803 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 12 Apr 2023 14:14:35 -0400
Subject: [PATCH 3/3] gnucash: update to 5.0, enable SQL support

---
 srcpkgs/gnucash/files/README.voidlinux |  9 ++++++
 srcpkgs/gnucash/template               | 38 ++++++++++++++------------
 2 files changed, 30 insertions(+), 17 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 000000000000..3f48d63b07fc
--- /dev/null
+++ b/srcpkgs/gnucash/files/README.voidlinux
@@ -0,0 +1,9 @@
+Installing GnuCash does not provide the libraries necessary to use its SQL
+backend. Install the following packages to enable their corresponding SQL
+backends:
+
+libdbdmysql		MySQL
+libdbdpgsql		PostgreSQL
+libdbdsqlite	SQLite
+
+To install all of the above, install libdbi-drivers.
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 3b3d1a4390e2..06bb934ac8ac 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,21 +1,23 @@
 # Template file for 'gnucash'
 pkgname=gnucash
-version=4.13
-revision=2
+version=5.0
+revision=1
 build_style=cmake
 make_check_target=check
-configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"
-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"
+configure_args="-DWITH_PYTHON=1 -DCOMPILE_GSCHEMAS=0"
+hostmakedepends="gettext guile libxslt perl pkg-config python3 swig"
+makedepends="aqbanking-devel boost-devel gc-devel glib-devel gtest-devel
+ guile-devel gwenhywfar-devel gwenhywfar-gtk3 icu-devel ktoblzcheck-devel
+ libdbi-devel libdbi-drivers-devel libofx-devel libsecret-devel libxslt-devel
+ python3-devel tzdata webkit2gtk-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="${SOURCEFORGE_SITE}/gnucash/gnucash-${version}.tar.bz2"
+checksum=cfc13bab31aed8e4962805ef56530f9772889604910b5678cb5c79c283138824
 
 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() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (8 preceding siblings ...)
  2023-04-12 18:14 ` cinerea0
@ 2023-04-14  1:58 ` cinerea0
  2023-04-14  2:29 ` cinerea0
                   ` (15 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-04-14  1:58 UTC (permalink / raw)
  To: ml

[-- 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.0, 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: 7258 bytes --]

From da43acfbe1359b1eecab0606fe591fe69fce4238 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 13 Apr 2023 21:55:33 -0400
Subject: [PATCH 1/2] New package: libdbi-0.9.0

---
 common/shlibs           |  1 +
 srcpkgs/libdbi-devel    |  1 +
 srcpkgs/libdbi-doc      |  1 +
 srcpkgs/libdbi/template | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 605a8249c8e2..963a65824733 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4243,3 +4243,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From e0991cf3f20c5844b8701a30be76f76a6fc2467c Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 13 Apr 2023 21:57:49 -0400
Subject: [PATCH 2/2] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbdmysql             |   1 +
 srcpkgs/libdbdpgsql             |   1 +
 srcpkgs/libdbdsqlite            |   1 +
 srcpkgs/libdbi-drivers-devel    |   1 +
 srcpkgs/libdbi-drivers-doc      |   1 +
 srcpkgs/libdbi-drivers/template | 102 ++++++++++++++++++++++++++++++++
 6 files changed, 107 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 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..227040e93840
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,102 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --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
+
+pre_configure() {
+	autoreconf -fi
+}
+
+# build_style is meta because subpackages move all files out of the main
+# package, so build steps must be directly included. do_configure through
+# do_install are taken directly from common/build-style/gnu-configure.sh.
+do_configure() {
+	: ${configure_script:=./configure}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${configure_script} ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=make}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+		if make -q check 2>/dev/null; then
+			:
+		else
+			if [ $? -eq 2 ]; then
+				msg_warn 'No target to "make check".\n'
+				return 0
+			fi
+		fi
+	fi
+
+	: ${make_cmd:=make}
+	: ${make_check_target:=check}
+
+	${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
+
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+}
+
+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"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (9 preceding siblings ...)
  2023-04-14  1:58 ` cinerea0
@ 2023-04-14  2:29 ` cinerea0
  2023-04-14  2:39 ` cinerea0
                   ` (14 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-04-14  2:29 UTC (permalink / raw)
  To: ml

[-- 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.0, 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: 7345 bytes --]

From 212901801b9e37efdc3054c193fa177feea1c391 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 13 Apr 2023 22:28:43 -0400
Subject: [PATCH 1/2] New package: libdbi-0.9.0

---
 common/shlibs           |  1 +
 srcpkgs/libdbi-devel    |  1 +
 srcpkgs/libdbi-doc      |  1 +
 srcpkgs/libdbi/template | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 605a8249c8e2..963a65824733 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4243,3 +4243,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From e727329fc3fe352110d97b3a132798b4da0c0731 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 13 Apr 2023 22:29:28 -0400
Subject: [PATCH 2/2] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbdmysql             |   1 +
 srcpkgs/libdbdpgsql             |   1 +
 srcpkgs/libdbdsqlite            |   1 +
 srcpkgs/libdbi-drivers-devel    |   1 +
 srcpkgs/libdbi-drivers-doc      |   1 +
 srcpkgs/libdbi-drivers/template | 106 ++++++++++++++++++++++++++++++++
 6 files changed, 111 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 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..4af7f866297c
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,106 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --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+=" --host=${XBPS_CROSS_TRIPLET}"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
+
+# build_style is meta because subpackages move all files out of the main
+# package, so build steps must be directly included. do_configure through
+# do_install are taken directly from common/build-style/gnu-configure.sh.
+do_configure() {
+	: ${configure_script:=./configure}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${configure_script} ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=make}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+		if make -q check 2>/dev/null; then
+			:
+		else
+			if [ $? -eq 2 ]; then
+				msg_warn 'No target to "make check".\n'
+				return 0
+			fi
+		fi
+	fi
+
+	: ${make_cmd:=make}
+	: ${make_check_target:=check}
+
+	${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
+
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+}
+
+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"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (10 preceding siblings ...)
  2023-04-14  2:29 ` cinerea0
@ 2023-04-14  2:39 ` cinerea0
  2023-04-14  2:46 ` cinerea0
                   ` (13 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-04-14  2:39 UTC (permalink / raw)
  To: ml

[-- 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.0, 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: 7375 bytes --]

From 212901801b9e37efdc3054c193fa177feea1c391 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 13 Apr 2023 22:28:43 -0400
Subject: [PATCH 1/2] New package: libdbi-0.9.0

---
 common/shlibs           |  1 +
 srcpkgs/libdbi-devel    |  1 +
 srcpkgs/libdbi-doc      |  1 +
 srcpkgs/libdbi/template | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 605a8249c8e2..963a65824733 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4243,3 +4243,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From ed08e6f0520a4236ae134c1ec0eb67a05cdbe86d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 13 Apr 2023 22:39:11 -0400
Subject: [PATCH 2/2] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbdmysql             |   1 +
 srcpkgs/libdbdpgsql             |   1 +
 srcpkgs/libdbdsqlite            |   1 +
 srcpkgs/libdbi-drivers-devel    |   1 +
 srcpkgs/libdbi-drivers-doc      |   1 +
 srcpkgs/libdbi-drivers/template | 106 ++++++++++++++++++++++++++++++++
 6 files changed, 111 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 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..d317aaa2dfe2
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,106 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --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+=" --host=${XBPS_CROSS_TRIPLET} --with-libdbi-libdir=/usr/lib"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
+
+# build_style is meta because subpackages move all files out of the main
+# package, so build steps must be directly included. do_configure through
+# do_install are taken directly from common/build-style/gnu-configure.sh.
+do_configure() {
+	: ${configure_script:=./configure}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${configure_script} ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=make}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+		if make -q check 2>/dev/null; then
+			:
+		else
+			if [ $? -eq 2 ]; then
+				msg_warn 'No target to "make check".\n'
+				return 0
+			fi
+		fi
+	fi
+
+	: ${make_cmd:=make}
+	: ${make_check_target:=check}
+
+	${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
+
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+}
+
+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"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (11 preceding siblings ...)
  2023-04-14  2:39 ` cinerea0
@ 2023-04-14  2:46 ` cinerea0
  2023-06-27 17:49 ` [PR PATCH] [Updated] [WIP] " cinerea0
                   ` (12 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-04-14  2:46 UTC (permalink / raw)
  To: ml

[-- 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.0, 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: 7396 bytes --]

From 212901801b9e37efdc3054c193fa177feea1c391 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 13 Apr 2023 22:28:43 -0400
Subject: [PATCH 1/2] New package: libdbi-0.9.0

---
 common/shlibs           |  1 +
 srcpkgs/libdbi-devel    |  1 +
 srcpkgs/libdbi-doc      |  1 +
 srcpkgs/libdbi/template | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 605a8249c8e2..963a65824733 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4243,3 +4243,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From dd56e9eeb228928ef7a4b62af9811d1f0264e394 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 13 Apr 2023 22:46:22 -0400
Subject: [PATCH 2/2] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbdmysql             |   1 +
 srcpkgs/libdbdpgsql             |   1 +
 srcpkgs/libdbdsqlite            |   1 +
 srcpkgs/libdbi-drivers-devel    |   1 +
 srcpkgs/libdbi-drivers-doc      |   1 +
 srcpkgs/libdbi-drivers/template | 107 ++++++++++++++++++++++++++++++++
 6 files changed, 112 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 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..725c6d1d259c
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,107 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --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+=" --host=${XBPS_CROSS_TRIPLET}
+	 --with-libdbi-libdir=${XBPS_CROSS_BASE}/usr/lib"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
+
+# build_style is meta because subpackages move all files out of the main
+# package, so build steps must be directly included. do_configure through
+# do_install are taken directly from common/build-style/gnu-configure.sh.
+do_configure() {
+	: ${configure_script:=./configure}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${configure_script} ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=make}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+		if make -q check 2>/dev/null; then
+			:
+		else
+			if [ $? -eq 2 ]; then
+				msg_warn 'No target to "make check".\n'
+				return 0
+			fi
+		fi
+	fi
+
+	: ${make_cmd:=make}
+	: ${make_check_target:=check}
+
+	${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
+
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+}
+
+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"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (12 preceding siblings ...)
  2023-04-14  2:46 ` cinerea0
@ 2023-06-27 17:49 ` cinerea0
  2023-06-27 18:03 ` cinerea0
                   ` (11 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-06-27 17:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 774 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

[WIP] gnucash: update to 5.0, 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: 7308 bytes --]

From 0b032ad2f0a5661960e73e5d386e89d50f517e33 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 13:48:39 -0400
Subject: [PATCH 1/2] New package: libdbi-0.9.0

---
 common/shlibs           |  1 +
 srcpkgs/libdbi-devel    |  1 +
 srcpkgs/libdbi-doc      |  1 +
 srcpkgs/libdbi/template | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 754c2aa23049..700bcc0eea0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4279,3 +4279,4 @@ libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
 libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From dc0496e525e9dbdbcd0968fc175754d74412f81e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 13:49:31 -0400
Subject: [PATCH 2/2] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbdmysql             |   1 +
 srcpkgs/libdbdpgsql             |   1 +
 srcpkgs/libdbdsqlite            |   1 +
 srcpkgs/libdbi-drivers-devel    |   1 +
 srcpkgs/libdbi-drivers-doc      |   1 +
 srcpkgs/libdbi-drivers/template | 106 ++++++++++++++++++++++++++++++++
 6 files changed, 111 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 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..87f414fbd927
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,106 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --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-libdbi-libdir=${XBPS_CROSS_BASE}/usr/include"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
+
+# build_style is meta because subpackages move all files out of the main
+# package, so build steps must be directly included. do_configure through
+# do_install are taken directly from common/build-style/gnu-configure.sh.
+do_configure() {
+	: ${configure_script:=./configure}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${configure_script} ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=make}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+		if make -q check 2>/dev/null; then
+			:
+		else
+			if [ $? -eq 2 ]; then
+				msg_warn 'No target to "make check".\n'
+				return 0
+			fi
+		fi
+	fi
+
+	: ${make_cmd:=make}
+	: ${make_check_target:=check}
+
+	${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
+
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+}
+
+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"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (13 preceding siblings ...)
  2023-06-27 17:49 ` [PR PATCH] [Updated] [WIP] " cinerea0
@ 2023-06-27 18:03 ` cinerea0
  2023-06-27 18:09 ` cinerea0
                   ` (10 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-06-27 18:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 774 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

[WIP] gnucash: update to 5.0, 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: 7366 bytes --]

From 0b032ad2f0a5661960e73e5d386e89d50f517e33 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 13:48:39 -0400
Subject: [PATCH 1/2] New package: libdbi-0.9.0

---
 common/shlibs           |  1 +
 srcpkgs/libdbi-devel    |  1 +
 srcpkgs/libdbi-doc      |  1 +
 srcpkgs/libdbi/template | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 754c2aa23049..700bcc0eea0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4279,3 +4279,4 @@ libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
 libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From 98746ab0e64d16b084f10c833923ecda40c0f107 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 14:03:02 -0400
Subject: [PATCH 2/2] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbdmysql             |   1 +
 srcpkgs/libdbdpgsql             |   1 +
 srcpkgs/libdbdsqlite            |   1 +
 srcpkgs/libdbi-drivers-devel    |   1 +
 srcpkgs/libdbi-drivers-doc      |   1 +
 srcpkgs/libdbi-drivers/template | 107 ++++++++++++++++++++++++++++++++
 6 files changed, 112 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 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..11d1f7146ce5
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,107 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --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+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET} \
+	--with-libdbi-libdir=${XBPS_CROSS_BASE}/usr/include"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
+
+# build_style is meta because subpackages move all files out of the main
+# package, so build steps must be directly included. do_configure through
+# do_install are taken directly from common/build-style/gnu-configure.sh.
+do_configure() {
+	: ${configure_script:=./configure}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${configure_script} ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=make}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+		if make -q check 2>/dev/null; then
+			:
+		else
+			if [ $? -eq 2 ]; then
+				msg_warn 'No target to "make check".\n'
+				return 0
+			fi
+		fi
+	fi
+
+	: ${make_cmd:=make}
+	: ${make_check_target:=check}
+
+	${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
+
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+}
+
+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"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (14 preceding siblings ...)
  2023-06-27 18:03 ` cinerea0
@ 2023-06-27 18:09 ` cinerea0
  2023-06-27 18:20 ` cinerea0
                   ` (9 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-06-27 18:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 774 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

[WIP] gnucash: update to 5.0, 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: 7366 bytes --]

From 0b032ad2f0a5661960e73e5d386e89d50f517e33 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 13:48:39 -0400
Subject: [PATCH 1/2] New package: libdbi-0.9.0

---
 common/shlibs           |  1 +
 srcpkgs/libdbi-devel    |  1 +
 srcpkgs/libdbi-doc      |  1 +
 srcpkgs/libdbi/template | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 754c2aa23049..700bcc0eea0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4279,3 +4279,4 @@ libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
 libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From 72d74083c3fea9d72bba1b95b20e326242f46734 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 14:08:50 -0400
Subject: [PATCH 2/2] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbdmysql             |   1 +
 srcpkgs/libdbdpgsql             |   1 +
 srcpkgs/libdbdsqlite            |   1 +
 srcpkgs/libdbi-drivers-devel    |   1 +
 srcpkgs/libdbi-drivers-doc      |   1 +
 srcpkgs/libdbi-drivers/template | 107 ++++++++++++++++++++++++++++++++
 6 files changed, 112 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 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..080c07d8578d
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,107 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --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+=" --host=${XBPS_CROSS_TRIPLET} --target=${XBPS_TRIPLET} \
+	--with-libdbi-libdir=${XBPS_CROSS_BASE}/usr/include"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
+
+# build_style is meta because subpackages move all files out of the main
+# package, so build steps must be directly included. do_configure through
+# do_install are taken directly from common/build-style/gnu-configure.sh.
+do_configure() {
+	: ${configure_script:=./configure}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${configure_script} ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=make}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+		if make -q check 2>/dev/null; then
+			:
+		else
+			if [ $? -eq 2 ]; then
+				msg_warn 'No target to "make check".\n'
+				return 0
+			fi
+		fi
+	fi
+
+	: ${make_cmd:=make}
+	: ${make_check_target:=check}
+
+	${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
+
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+}
+
+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"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (15 preceding siblings ...)
  2023-06-27 18:09 ` cinerea0
@ 2023-06-27 18:20 ` cinerea0
  2023-06-27 18:41 ` cinerea0
                   ` (8 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-06-27 18:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 774 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

[WIP] gnucash: update to 5.0, 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: 7362 bytes --]

From 0b032ad2f0a5661960e73e5d386e89d50f517e33 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 13:48:39 -0400
Subject: [PATCH 1/2] New package: libdbi-0.9.0

---
 common/shlibs           |  1 +
 srcpkgs/libdbi-devel    |  1 +
 srcpkgs/libdbi-doc      |  1 +
 srcpkgs/libdbi/template | 30 ++++++++++++++++++++++++++++++
 4 files changed, 33 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 754c2aa23049..700bcc0eea0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4279,3 +4279,4 @@ libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
 libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..8298ad802294
--- /dev/null
+++ b/srcpkgs/libdbi/template
@@ -0,0 +1,30 @@
+# 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/*.a"
+	}
+}
+
+libdbi-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

From 87c699133e8e676b12d9055b48df96d66502773d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 14:20:15 -0400
Subject: [PATCH 2/2] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbdmysql             |   1 +
 srcpkgs/libdbdpgsql             |   1 +
 srcpkgs/libdbdsqlite            |   1 +
 srcpkgs/libdbi-drivers-devel    |   1 +
 srcpkgs/libdbi-drivers-doc      |   1 +
 srcpkgs/libdbi-drivers/template | 107 ++++++++++++++++++++++++++++++++
 6 files changed, 112 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 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..8422e33558bf
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,107 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --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+=" --host=${XBPS_CROSS_TRIPLET} --target=${XBPS_TRIPLET} \
+	--with-libdbi-libdir=${XBPS_CROSS_BASE}/usr/lib"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
+
+# build_style is meta because subpackages move all files out of the main
+# package, so build steps must be directly included. do_configure through
+# do_install are taken directly from common/build-style/gnu-configure.sh.
+do_configure() {
+	: ${configure_script:=./configure}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${configure_script} ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=make}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+		if make -q check 2>/dev/null; then
+			:
+		else
+			if [ $? -eq 2 ]; then
+				msg_warn 'No target to "make check".\n'
+				return 0
+			fi
+		fi
+	fi
+
+	: ${make_cmd:=make}
+	: ${make_check_target:=check}
+
+	${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
+
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+}
+
+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"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (16 preceding siblings ...)
  2023-06-27 18:20 ` cinerea0
@ 2023-06-27 18:41 ` cinerea0
  2023-06-27 19:08 ` cinerea0
                   ` (7 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-06-27 18:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 774 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

[WIP] gnucash: update to 5.0, 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: 7387 bytes --]

From 3b315adcedd268e2aa57a95ee75a0b04c228ca44 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 14:40:17 -0400
Subject: [PATCH 1/2] 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 754c2aa23049..700bcc0eea0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4279,3 +4279,4 @@ libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
 libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..dcdaf1cf19a8
--- /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 036a4d2d25913f6b42a614749a80f0150dda9020 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 14:40:55 -0400
Subject: [PATCH 2/2] New package: libdbi-drivers-0.9.0

---
 srcpkgs/libdbdmysql             |   1 +
 srcpkgs/libdbdpgsql             |   1 +
 srcpkgs/libdbdsqlite            |   1 +
 srcpkgs/libdbi-drivers-devel    |   1 +
 srcpkgs/libdbi-drivers-doc      |   1 +
 srcpkgs/libdbi-drivers/template | 107 ++++++++++++++++++++++++++++++++
 6 files changed, 112 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 120000 srcpkgs/libdbi-drivers-doc
 create mode 100644 srcpkgs/libdbi-drivers/template

diff --git a/srcpkgs/libdbdmysql b/srcpkgs/libdbdmysql
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-devel
@@ -0,0 +1 @@
+libdbi-drivers
\ No newline at end of file
diff --git a/srcpkgs/libdbi-drivers-doc b/srcpkgs/libdbi-drivers-doc
new file mode 120000
index 000000000000..28d3bc25c5fc
--- /dev/null
+++ b/srcpkgs/libdbi-drivers-doc
@@ -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 000000000000..8422e33558bf
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,107 @@
+# Template file for 'libdbi-drivers'
+pkgname=libdbi-drivers
+version=0.9.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --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+=" --host=${XBPS_CROSS_TRIPLET} --target=${XBPS_TRIPLET} \
+	--with-libdbi-libdir=${XBPS_CROSS_BASE}/usr/lib"
+fi
+
+pre_configure() {
+	autoreconf -fi
+}
+
+# build_style is meta because subpackages move all files out of the main
+# package, so build steps must be directly included. do_configure through
+# do_install are taken directly from common/build-style/gnu-configure.sh.
+do_configure() {
+	: ${configure_script:=./configure}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${configure_script} ${configure_args}
+}
+
+do_build() {
+	: ${make_cmd:=make}
+
+	export lt_cv_sys_lib_dlsearch_path_spec="/usr/lib64 /usr/lib32 /usr/lib /lib /usr/local/lib"
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+	if [ -z "$make_cmd" ] && [ -z "$make_check_target" ]; then
+		if make -q check 2>/dev/null; then
+			:
+		else
+			if [ $? -eq 2 ]; then
+				msg_warn 'No target to "make check".\n'
+				return 0
+			fi
+		fi
+	fi
+
+	: ${make_cmd:=make}
+	: ${make_check_target:=check}
+
+	${make_check_pre} ${make_cmd} ${makejobs} ${make_check_args} ${make_check_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	: ${make_install_target:=install}
+
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
+}
+
+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"
+	}
+}
+
+libdbi-drivers-doc_package() {
+	short_desc+=" - documentation"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (17 preceding siblings ...)
  2023-06-27 18:41 ` cinerea0
@ 2023-06-27 19:08 ` cinerea0
  2023-06-27 19:26 ` cinerea0
                   ` (6 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-06-27 19:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 774 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

[WIP] gnucash: update to 5.0, 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: 5743 bytes --]

From 3b315adcedd268e2aa57a95ee75a0b04c228ca44 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 14:40:17 -0400
Subject: [PATCH 1/2] 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 754c2aa23049..700bcc0eea0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4279,3 +4279,4 @@ libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
 libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..dcdaf1cf19a8
--- /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 18d0a51d8725847f8e918987e25c37716f88ab36 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 15:07:52 -0400
Subject: [PATCH 2/2] 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 | 57 +++++++++++++++++++++++++++++++++
 5 files changed, 61 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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..55e6fc92cd9a
--- /dev/null
+++ b/srcpkgs/libdbi-drivers/template
@@ -0,0 +1,57 @@
+# 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+=" --host=${XBPS_CROSS_TRIPLET} --target=${XBPS_TRIPLET} \
+#	--with-libdbi-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"
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (18 preceding siblings ...)
  2023-06-27 19:08 ` cinerea0
@ 2023-06-27 19:26 ` cinerea0
  2023-07-31 16:45 ` cinerea0
                   ` (5 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-06-27 19:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 774 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

[WIP] gnucash: update to 5.0, 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: 5678 bytes --]

From b09a32aa9d7254c902e81ae111c33e1a450bfd88 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 15:25:40 -0400
Subject: [PATCH 1/2] 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 754c2aa23049..700bcc0eea0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4279,3 +4279,4 @@ libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
 libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
+libdbi.so.1 libdbi-0.9.0_1
diff --git a/srcpkgs/libdbi-devel b/srcpkgs/libdbi-devel
new file mode 120000
index 000000000000..461034ca75ea
--- /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 000000000000..461034ca75ea
--- /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 000000000000..dcdaf1cf19a8
--- /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 ac276d927fcba10ec54b41e5645d12ab0415356e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 27 Jun 2023 15:26:13 -0400
Subject: [PATCH 2/2] 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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..28d3bc25c5fc
--- /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 000000000000..4bc80399b3a8
--- /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-libdbi-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"
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (19 preceding siblings ...)
  2023-06-27 19:26 ` cinerea0
@ 2023-07-31 16:45 ` cinerea0
  2023-07-31 17:00 ` cinerea0
                   ` (4 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-07-31 16:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 774 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

[WIP] gnucash: update to 5.0, 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: 5690 bytes --]

From ff506df2d13ad74de63af432eb5c9a2ae050da47 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 31 Jul 2023 12:44:22 -0400
Subject: [PATCH 1/2] 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 a521ea1b66ae1..ed7fb0c6faae3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4324,3 +4324,4 @@ libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
 liblc3.so.1 liblc3-1.0.3_1
 libmimalloc.so.2 mimalloc-2.1.2_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 40ad7dd333d44fee0538c91aef786f76bb6c62c0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 31 Jul 2023 12:45:00 -0400
Subject: [PATCH 2/2] 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..cc5b5739b3779
--- /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-libdbi-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"
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (20 preceding siblings ...)
  2023-07-31 16:45 ` cinerea0
@ 2023-07-31 17:00 ` cinerea0
  2023-07-31 17:09 ` cinerea0
                   ` (3 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-07-31 17:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 774 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

[WIP] gnucash: update to 5.0, 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: 5687 bytes --]

From ff506df2d13ad74de63af432eb5c9a2ae050da47 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 31 Jul 2023 12:44:22 -0400
Subject: [PATCH 1/2] 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 a521ea1b66ae1..ed7fb0c6faae3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4324,3 +4324,4 @@ libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
 liblc3.so.1 liblc3-1.0.3_1
 libmimalloc.so.2 mimalloc-2.1.2_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 1a1de043b769ccd13cb13aa8ab176cf9ab8162d5 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 31 Jul 2023 13:00:06 -0400
Subject: [PATCH 2/2] 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..4bc80399b3a89
--- /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-libdbi-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"
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (21 preceding siblings ...)
  2023-07-31 17:00 ` cinerea0
@ 2023-07-31 17:09 ` cinerea0
  2023-07-31 17:15 ` cinerea0
                   ` (2 subsequent siblings)
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-07-31 17:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 774 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

[WIP] gnucash: update to 5.0, 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: 5684 bytes --]

From ff506df2d13ad74de63af432eb5c9a2ae050da47 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 31 Jul 2023 12:44:22 -0400
Subject: [PATCH 1/2] 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 a521ea1b66ae1..ed7fb0c6faae3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4324,3 +4324,4 @@ libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
 liblc3.so.1 liblc3-1.0.3_1
 libmimalloc.so.2 mimalloc-2.1.2_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 6dbbf471a09b0ff4e28425332553e6ea6fe77040 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 31 Jul 2023 13:08:50 -0400
Subject: [PATCH 2/2] 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"
+	}
+}

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] gnucash: update to 5.0, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (22 preceding siblings ...)
  2023-07-31 17:09 ` cinerea0
@ 2023-07-31 17:15 ` cinerea0
  2023-08-06 18:57 ` [PR PATCH] [Updated] gnucash: update to 5.3, " cinerea0
  2023-08-09 17:26 ` [PR PATCH] [Merged]: " Duncaen
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-07-31 17:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 774 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

[WIP] gnucash: update to 5.0, 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: 9059 bytes --]

From ff506df2d13ad74de63af432eb5c9a2ae050da47 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 31 Jul 2023 12:44:22 -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 a521ea1b66ae1..ed7fb0c6faae3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4324,3 +4324,4 @@ libtext-engine-0.1.so.0 text-engine-0.1.1_1
 libvmaf.so.1 vmaf-2.3.1_1
 liblc3.so.1 liblc3-1.0.3_1
 libmimalloc.so.2 mimalloc-2.1.2_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 6dbbf471a09b0ff4e28425332553e6ea6fe77040 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 31 Jul 2023 13:08:50 -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 265c90580548e72a9827625e06914eae7199d2fc Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 31 Jul 2023 13:14:56 -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() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Updated] gnucash: update to 5.3, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (23 preceding siblings ...)
  2023-07-31 17:15 ` cinerea0
@ 2023-08-06 18:57 ` cinerea0
  2023-08-09 17:26 ` [PR PATCH] [Merged]: " Duncaen
  25 siblings, 0 replies; 27+ messages in thread
From: cinerea0 @ 2023-08-06 18:57 UTC (permalink / raw)
  To: ml

[-- 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() {

^ permalink raw reply	[flat|nested] 27+ messages in thread

* Re: [PR PATCH] [Merged]: gnucash: update to 5.3, enable SQL support + add libdbi packages
  2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
                   ` (24 preceding siblings ...)
  2023-08-06 18:57 ` [PR PATCH] [Updated] gnucash: update to 5.3, " cinerea0
@ 2023-08-09 17:26 ` Duncaen
  25 siblings, 0 replies; 27+ messages in thread
From: Duncaen @ 2023-08-09 17:26 UTC (permalink / raw)
  To: ml

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

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

gnucash: update to 5.3, enable SQL support + add libdbi packages
https://github.com/void-linux/void-packages/pull/43386

Description:
#### 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**


^ permalink raw reply	[flat|nested] 27+ messages in thread

end of thread, other threads:[~2023-08-09 17:26 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-11  3:52 [PR PATCH] gnucash: update to 5.0, enable SQL support + add libdbi packages cinerea0
2023-04-11  4:00 ` cinerea0
2023-04-11  4:14 ` [PR PATCH] [Updated] " cinerea0
2023-04-11  4:48 ` sgn
2023-04-11  5:20 ` cinerea0
2023-04-11 14:30 ` sgn
2023-04-11 18:17 ` cinerea0
2023-04-12  4:59 ` sgn
2023-04-12 17:23 ` [PR PATCH] [Updated] " cinerea0
2023-04-12 18:14 ` cinerea0
2023-04-14  1:58 ` cinerea0
2023-04-14  2:29 ` cinerea0
2023-04-14  2:39 ` cinerea0
2023-04-14  2:46 ` cinerea0
2023-06-27 17:49 ` [PR PATCH] [Updated] [WIP] " cinerea0
2023-06-27 18:03 ` cinerea0
2023-06-27 18:09 ` cinerea0
2023-06-27 18:20 ` cinerea0
2023-06-27 18:41 ` cinerea0
2023-06-27 19:08 ` cinerea0
2023-06-27 19:26 ` cinerea0
2023-07-31 16:45 ` cinerea0
2023-07-31 17:00 ` cinerea0
2023-07-31 17:09 ` cinerea0
2023-07-31 17:15 ` cinerea0
2023-08-06 18:57 ` [PR PATCH] [Updated] gnucash: update to 5.3, " cinerea0
2023-08-09 17:26 ` [PR PATCH] [Merged]: " Duncaen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).