mirror of
https://github.com/void-linux/void-packages.git
synced 2025-04-22 17:17:03 +02:00
quassel: honor user config in quassel-core's service script
along, fix build with qt5.14
This commit is contained in:
parent
99daec976a
commit
7e2fe2ce92
4 changed files with 24 additions and 15 deletions
|
@ -1,11 +0,0 @@
|
|||
(taken verbatim from quassel's release announcement)
|
||||
https://quassel-irc.org/node/134
|
||||
|
||||
Before you upgrade, please be aware that both the database schema and the
|
||||
config file formats have been updated since 0.12. Quassel will automatically
|
||||
upgrade both once the new version is started for the first time, however no
|
||||
rollback is possible, so do make a backup before starting the new version! The
|
||||
upgrade may take a long time (up to several hours) if your database is
|
||||
(un)reasonably large, during which the core or mono client cannot be used. The
|
||||
upgrade may also temporarily require up to double the disk space. Do not
|
||||
interrupt the upgrade process, otherwise your database may become corrupted!
|
|
@ -1,5 +1,4 @@
|
|||
#!/bin/sh
|
||||
[ -r conf ] && . ./conf
|
||||
exec chpst -u quassel quasselcore \
|
||||
--logfile=/var/log/quassel/quasselcore.log \
|
||||
--configdir=/var/lib/quassel \
|
||||
--require-ssl
|
||||
${OPTS:=--require-ssl --configdir=/var/lib/quassel --logfile=/var/log/quassel/quasselcore.log}
|
||||
|
|
21
srcpkgs/quassel/patches/qt5-14.patch
Normal file
21
srcpkgs/quassel/patches/qt5-14.patch
Normal file
|
@ -0,0 +1,21 @@
|
|||
# upstream: yes
|
||||
# picked from 579e559a6322209df7cd51c34801fecff5fe734b
|
||||
|
||||
--- src/common/types.h
|
||||
+++ src/common/types.h
|
||||
@@ -140,6 +140,7 @@
|
||||
typedef QList<MsgId> MsgIdList;
|
||||
typedef QList<BufferId> BufferIdList;
|
||||
|
||||
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
|
||||
/**
|
||||
* Catch-all stream serialization operator for enum types.
|
||||
*
|
||||
@@ -169,6 +170,7 @@
|
||||
value = static_cast<T>(v);
|
||||
return in;
|
||||
}
|
||||
+#endif
|
||||
|
||||
// Exceptions
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'quassel'
|
||||
pkgname=quassel
|
||||
version=0.13.1
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=cmake
|
||||
configure_args="-DWANT_QTCLIENT=ON -DWANT_MONO=ON -DWANT_CORE=ON -DUSE_QT5=ON
|
||||
-DWITH_BUNDLED_ICONS=OFF"
|
||||
|
|
Loading…
Add table
Reference in a new issue