Merge branch 'master' into 'master'

Master

See merge request src_prepare/src_prepare-overlay!52

dev-libs/libQuotient/Manifest

@@ -1,2 +1,2 @@
+DIST 0.6.0.tar.gz 556773 BLAKE2B 0361b7b88cb93dbbe1dee21751425e780eed68e2e50eed8bf79f01ff4eb49047130502d5b242b6c25871f5894ca2cf5d57069e44d22164dfd8c43efbb4485704 SHA512 42f7d1ee788cc2bd9d88f0ec4339573d1c4be85c462ddb81d4b4cc222fa46d3482bf4c231fd8c35f334aefa112f45251239a99c37456efcae0ca5d9359271f72
 DIST libQuotient-0.6_beta1.tar.gz 549192 BLAKE2B e91e08bb2cfe8b369d79ae9d4514c15097042d74510d8d7428c25c12b635974fb637a126e4d87f34f9913f7d65ea14c5b83a5ebc2ed57039dc9fb884112e03bc SHA512 255560ee9a827ce140291859c9a7d11c718094b38a06e4555539aeda055daacd6a354e6685d67991fbbf2b407ab92b12986b854c27b81cfddb7b9b26c0e80e04
-DIST libQuotient-0.6_beta2.tar.gz 550380 BLAKE2B fd53fbc8ed4f2cff7d468e14dd2d2ee011b526f99fa5af499a3c2bb4d8ba2dfa07ffc83f0be80a747651c0f805c9e6802c3bc371e28804bea16d257890e942d0 SHA512 2261efcfec77cd478f5a50be88cdb4be506e2ae4f95970ed578258fe59b5033bebb570a25cd5a8b84631be3aa49f2d9a5abc3a0f058b6e159438c06163730d8e

dev-libs/libQuotient/libQuotient-0.6.0.ebuild

@@ -8,13 +8,11 @@ HOMEPAGE="https://github.com/qmatrixclient/libqmatrixclient"
 
 inherit eutils cmake
 
-MY_PV="$(ver_rs 2 '-')"
-
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/quotient-im/${PN}.git"
 else
-	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/quotient-im/libQuotient/archive/${PV}.tar.gz "
 	KEYWORDS="~amd64"
 fi
 
@@ -30,7 +28,7 @@ DEPEND="
 	!!dev-libs/libqmatrixclient
 "
 
-S="${WORKDIR}/${PN}-${MY_PV}"
+S="${WORKDIR}/${PN}-${PV}"
 
 src_configure() {
 	local mycmakeargs=(

net-im/spectral/files/libQuotient-0.6.patch-1.patch

@@ -0,0 +1,52 @@
+--- 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) {

net-im/spectral/files/libQuotient-0.6.patch-2.patch

@@ -0,0 +1,22 @@
+--- 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();
+       }
+     }

net-im/spectral/spectral-854.ebuild

@@ -32,7 +32,7 @@ RDEPEND="
 	dev-qt/qtmultimedia[qml]
 	dev-qt/qtwidgets
 	>=dev-qt/qtquickcontrols2-5.12
-	=dev-libs/libQuotient-0.6_beta1
+	>=dev-libs/libQuotient-0.6.0
 	dev-libs/libQtOlm
 	dev-libs/qtkeychain
 	|| ( media-fonts/roboto media-fonts/noto )
@@ -44,6 +44,12 @@ DEPEND="
 	>=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