Re: [PR PATCH] [Updated] mumble: add qt5-plugin-sqlite to murmur deps

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

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

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

https://github.com/paper42/void-packages murmur-sqlite
https://github.com/void-linux/void-packages/pull/37230

mumble: add qt5-plugin-sqlite to murmur deps
otherwise, running mumble-server with the default configuration fails
<F>2022-05-21 19:47:53.080 ServerDB: Database driver QSQLITE not available

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 46358e87ba9a662811f6379e820a2ef149883b97 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 21 May 2022 22:01:38 +0200
Subject: [PATCH] mumble: improve murmur package

* add qt5-plugin-sqlite to dependencies
otherwise, running mumble-server with the default configuration fails
<F>2022-05-21 19:47:53.080 ServerDB: Database driver QSQLITE not available

* add a system service
* remove murmur-user-wrapper
---
 srcpkgs/mumble/files/mumble-server/log/run |  3 +++
 srcpkgs/mumble/files/mumble-server/run     |  4 ++++
 srcpkgs/mumble/patches/config.patch        | 11 +++++++++++
 srcpkgs/mumble/template                    | 19 +++++++++++++------
 4 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/mumble/files/mumble-server/log/run
 create mode 100644 srcpkgs/mumble/files/mumble-server/run
 create mode 100644 srcpkgs/mumble/patches/config.patch

diff --git a/srcpkgs/mumble/files/mumble-server/log/run b/srcpkgs/mumble/files/mumble-server/log/run
new file mode 100644
index 000000000000..6b01a89f5be9
--- /dev/null
+++ b/srcpkgs/mumble/files/mumble-server/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -p daemon.notice -t murmur
diff --git a/srcpkgs/mumble/files/mumble-server/run b/srcpkgs/mumble/files/mumble-server/run
new file mode 100644
index 000000000000..ee17d0d1ed0d
--- /dev/null
+++ b/srcpkgs/mumble/files/mumble-server/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+[ -r ./conf ] && . ./conf
+exec chpst -u_murmur:_murmur mumble-server -fg -ini ${CONFIG_FILE:-/etc/murmur.ini} ${OPTS}
diff --git a/srcpkgs/mumble/patches/config.patch b/srcpkgs/mumble/patches/config.patch
new file mode 100644
index 000000000000..f85e1f1cefa8
--- /dev/null
+++ b/srcpkgs/mumble/patches/config.patch
@@ -0,0 +1,11 @@
+--- a/scripts/murmur.ini
++++ b/scripts/murmur.ini
+@@ -13,7 +13,7 @@
+ 
+ ; Path to database. If blank, will search for
+ ; murmur.sqlite in default locations or create it if not found.
+-database=
++database=/var/lib/murmur/murmur.sqlite
+ 
+ ; Murmur defaults to using SQLite with its default rollback journal.
+ ; In some situations, using SQLite's write-ahead log (WAL) can be
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 24f30f5e019d..65f96a90f282 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.4.230
-revision=4
+revision=5
 wrksrc=mumble-${version}.src
 build_style=cmake
 make_cmd=make
@@ -29,18 +29,25 @@ build_options_default="jack portaudio"
 export CMAKE_GENERATOR="Unix Makefiles"
 
 post_install() {
-	vbin ${wrksrc}/scripts/murmur-user-wrapper
-	vsconf scripts/murmur.ini
+	rm -f ${DESTDIR}/usr/share/man/man1/murmur-user-wrapper.1
+	vconf scripts/murmur.ini
+	vsv mumble-server
+	ln -sf murmurd.1 ${DESTDIR}/usr/share/man/man1/mumble-server.1
 	vlicense LICENSE
 }
 
 murmur_package() {
+	system_accounts="_murmur"
+	_murmur_homedir="/var/lib/murmur"
+	make_dirs="/var/lib/murmur 0750 _murmur _murmur"
+	conf_files="/etc/murmur.ini"
+	depends="qt5-plugin-sqlite"
 	short_desc+=" - Server software (mumble-server)"
 	pkg_install() {
+		vmove etc/sv/mumble-server
+		vmove etc/murmur.ini
 		vmove usr/bin/mumble-server
-		vmove usr/bin/murmur-user-wrapper
-		vmove usr/share/man/man1/murmur-user-wrapper.1
+		vmove usr/share/man/man1/mumble-server.1
 		vmove usr/share/man/man1/murmurd.1
-		vmove usr/share/examples/mumble/murmur.ini
 	}
 }