diff --git a/srcpkgs/quassel/INSTALL.msg b/srcpkgs/quassel/INSTALL.msg deleted file mode 100644 index 4cb0e4b1c0d..00000000000 --- a/srcpkgs/quassel/INSTALL.msg +++ /dev/null @@ -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! diff --git a/srcpkgs/quassel/files/quasselcore/run b/srcpkgs/quassel/files/quasselcore/run index 04e5ae914cd..f30e57eef93 100644 --- a/srcpkgs/quassel/files/quasselcore/run +++ b/srcpkgs/quassel/files/quasselcore/run @@ -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} diff --git a/srcpkgs/quassel/patches/qt5-14.patch b/srcpkgs/quassel/patches/qt5-14.patch new file mode 100644 index 00000000000..053ce94d864 --- /dev/null +++ b/srcpkgs/quassel/patches/qt5-14.patch @@ -0,0 +1,21 @@ +# upstream: yes +# picked from 579e559a6322209df7cd51c34801fecff5fe734b + +--- src/common/types.h ++++ src/common/types.h +@@ -140,6 +140,7 @@ + typedef QList MsgIdList; + typedef QList 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(v); + return in; + } ++#endif + + // Exceptions + diff --git a/srcpkgs/quassel/template b/srcpkgs/quassel/template index 3f28488879a..52651093a5d 100644 --- a/srcpkgs/quassel/template +++ b/srcpkgs/quassel/template @@ -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"