net-im/spectral: treeclean
Signed-off-by: Alfred Wingate <parona@protonmail.com>
This commit is contained in:
Alfred Wingate
Parona
parent
84c9a88f41
commit
4469296572
@ -1,2 +0,0 @@
|
||||
DIST 36befddf5d57faad990e72c88c5844794f274145.tar.gz 52369 BLAKE2B 02e2a85c5df7a173b1ec27f126474db0d1ddf2c5858d41b904d463277d134f6f301e25597fd71d61d4a512207eb739e094b44a6af7d9bb7deb65823ab6836691 SHA512 bfb7af36abd5ded014549042e760c1ec6779f46dd6c30e672ada21decc7a1b1a631ada1cc2c57d62d0daca4cccff9640077345b3661ef73021d5e2ee8058ae9b
|
||||
DIST spectral-854.tar.gz 846106 BLAKE2B 6dc95d52f0acff646e6114e85c16dc9881edbc96eda1168094a477ef3b23d459c9d77aeedbd317cfa225317a9a83cd089539ccafff76df2da3104ef457034b20 SHA512 c8e5c65829a6fae07371461da1f91f33c01194db43a72dda5a35492bcd23595b5270f578494835ca484f9d9de24ab264754fb28f3483fd8ba4c190540416a0cd
|
||||
@ -1,52 +0,0 @@
|
||||
--- a/src/spectralroom.cpp 2020-04-16 04:44:53.000000000 +0200
|
||||
+++ b/src/spectralroom.cpp 2020-07-29 05:33:32.000000000 +0200
|
||||
@@ -167,7 +167,7 @@
|
||||
QDateTime SpectralRoom::lastActiveTime() const {
|
||||
if (timelineSize() == 0)
|
||||
return QDateTime();
|
||||
- return messageEvents().rbegin()->get()->timestamp();
|
||||
+ return messageEvents().rbegin()->get()->originTimestamp();
|
||||
}
|
||||
|
||||
int SpectralRoom::savedTopVisibleIndex() const {
|
||||
@@ -397,30 +397,30 @@
|
||||
const auto job = connection()->uploadFile(localFile.toLocalFile());
|
||||
if (isJobRunning(job)) {
|
||||
connect(job, &BaseJob::success, this, [this, job] {
|
||||
- connection()->callApi<SetRoomStateJob>(
|
||||
- id(), "m.room.avatar", QJsonObject{{"url", job->contentUri()}});
|
||||
+ connection()->callApi<SetRoomStateWithKeyJob>(
|
||||
+ id(), "m.room.avatar", localUser()->id(), QJsonObject{{"url", job->contentUri()}});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void SpectralRoom::addLocalAlias(const QString& alias) {
|
||||
- auto aliases = localAliases();
|
||||
- if (aliases.contains(alias))
|
||||
+ auto a = aliases();
|
||||
+ if (a.contains(alias))
|
||||
return;
|
||||
|
||||
- aliases += alias;
|
||||
+ a += alias;
|
||||
|
||||
- setLocalAliases(aliases);
|
||||
+ setLocalAliases(a);
|
||||
}
|
||||
|
||||
void SpectralRoom::removeLocalAlias(const QString& alias) {
|
||||
- auto aliases = localAliases();
|
||||
- if (!aliases.contains(alias))
|
||||
+ auto a = aliases();
|
||||
+ if (!a.contains(alias))
|
||||
return;
|
||||
|
||||
- aliases.removeAll(alias);
|
||||
+ a.removeAll(alias);
|
||||
|
||||
- setLocalAliases(aliases);
|
||||
+ setLocalAliases(a);
|
||||
}
|
||||
|
||||
QString SpectralRoom::markdownToHTML(const QString& markdown) {
|
||||
@ -1,22 +0,0 @@
|
||||
--- a/src/publicroomlistmodel.cpp 2020-04-16 04:44:53.000000000 +0200
|
||||
+++ b/src/publicroomlistmodel.cpp 2020-07-29 05:33:32.000000000 +0200
|
||||
@@ -110,15 +110,14 @@
|
||||
attempted = true;
|
||||
|
||||
if (job->status() == BaseJob::Success) {
|
||||
- auto resp = job->data();
|
||||
- nextBatch = resp.nextBatch;
|
||||
+ nextBatch = job->nextBatch();
|
||||
|
||||
this->beginInsertRows({}, rooms.count(),
|
||||
- rooms.count() + resp.chunk.count() - 1);
|
||||
- rooms.append(resp.chunk);
|
||||
+ rooms.count() + job->chunk().count() - 1);
|
||||
+ rooms.append(job->chunk());
|
||||
this->endInsertRows();
|
||||
|
||||
- if (resp.nextBatch.isEmpty()) {
|
||||
+ if (job->nextBatch().isEmpty()) {
|
||||
emit hasMoreChanged();
|
||||
}
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>hedmoo@yahoo.com</email>
|
||||
<name>Andreas Westman Dorcsak</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1,76 +0,0 @@
|
||||
# Copyright 2020-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="A glossy client for Matrix, written in QtQuick Controls 2 and C++."
|
||||
HOMEPAGE="https://gitlab.com/spectral-im/spectral"
|
||||
|
||||
inherit cmake
|
||||
|
||||
COMMON_URI="https://github.com/oKcerG/SortFilterProxyModel/archive/36befddf5d57faad990e72c88c5844794f274145.tar.gz"
|
||||
|
||||
if [[ ${PV} == 9999 ]]
|
||||
then
|
||||
EGIT_REPO_URI="https://gitlab.com/b0/spectral.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://gitlab.com/spectral-im/spectral/-/archive/${PV}/${P}.tar.gz
|
||||
${COMMON_URI}"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
|
||||
RDEPEND="
|
||||
app-text/cmark
|
||||
dev-qt/qtdeclarative
|
||||
dev-qt/qtgui
|
||||
dev-qt/qtmultimedia[qml]
|
||||
dev-qt/qtwidgets
|
||||
>=dev-qt/qtquickcontrols2-5.12
|
||||
>=net-libs/libquotient-0.6.0
|
||||
dev-libs/libQtOlm
|
||||
dev-libs/qtkeychain
|
||||
|| ( media-fonts/roboto media-fonts/noto )
|
||||
dev-qt/qtsvg
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=dev-qt/qtcore-5.12
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# patches for build with libQuotient-0.6.0
|
||||
"${FILESDIR}/libQuotient-0.6.patch-1.patch"
|
||||
"${FILESDIR}/libQuotient-0.6.patch-2.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999 ]]
|
||||
then
|
||||
move_lib() {
|
||||
local IN_DIR="${1}"
|
||||
local OUT_DIR[ -z "${2}" ] && OUT_DIR="${IN_DIR}" || OUT_DIR="${2%/}/${IN_DIR}"
|
||||
mv "${WORKDIR}/${IN_DIR}"*/* "${S}/${OUT_DIR}" || die
|
||||
}
|
||||
|
||||
local thirdparty_libs=" SortFilterProxyModel"
|
||||
for thirdparty_lib in ${thirdparty_libs} ; do
|
||||
move_lib "${thirdparty_lib}" include
|
||||
done
|
||||
fi
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
@ -1,70 +0,0 @@
|
||||
# Copyright 2020-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="A glossy client for Matrix, written in QtQuick Controls 2 and C++."
|
||||
HOMEPAGE="https://gitlab.com/spectral-im/spectral"
|
||||
|
||||
inherit cmake
|
||||
|
||||
COMMON_URI="https://github.com/oKcerG/SortFilterProxyModel/archive/36befddf5d57faad990e72c88c5844794f274145.tar.gz"
|
||||
|
||||
if [[ ${PV} == 9999 ]]
|
||||
then
|
||||
EGIT_REPO_URI="https://gitlab.com/b0/spectral.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://gitlab.com/spectral-im/spectral/-/archive/${PV}/${P}.tar.gz
|
||||
${COMMON_URI}"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
|
||||
RDEPEND="
|
||||
app-text/cmark
|
||||
dev-qt/qtdeclarative
|
||||
dev-qt/qtgui
|
||||
dev-qt/qtmultimedia[qml]
|
||||
dev-qt/qtwidgets
|
||||
>=dev-qt/qtquickcontrols2-5.12
|
||||
>=net-libs/libquotient-0.6_beta1
|
||||
dev-libs/libQtOlm
|
||||
dev-libs/qtkeychain
|
||||
|| ( media-fonts/roboto media-fonts/noto )
|
||||
dev-qt/qtsvg
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
>=dev-qt/qtcore-5.12
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999 ]]
|
||||
then
|
||||
move_lib() {
|
||||
local IN_DIR="${1}"
|
||||
local OUT_DIR[ -z "${2}" ] && OUT_DIR="${IN_DIR}" || OUT_DIR="${2%/}/${IN_DIR}"
|
||||
mv "${WORKDIR}/${IN_DIR}"*/* "${S}/${OUT_DIR}" || die
|
||||
}
|
||||
|
||||
local thirdparty_libs=" SortFilterProxyModel"
|
||||
for thirdparty_lib in ${thirdparty_libs} ; do
|
||||
move_lib "${thirdparty_lib}" include
|
||||
done
|
||||
fi
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user