From 6ff48588e983a0fc768692a88686fbcc64fb5afd Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Mon, 8 Mar 2021 13:53:11 +0300 Subject: [PATCH 1/2] mtxclient: update to 0.4.1 --- common/shlibs | 2 +- .../mtxclient/patches/fix_login_dendrite.patch | 16 ++++++++++++++++ srcpkgs/mtxclient/template | 8 ++++---- 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/mtxclient/patches/fix_login_dendrite.patch diff --git a/common/shlibs b/common/shlibs index 70be7e00c51d..384755df8266 100644 --- a/common/shlibs +++ b/common/shlibs @@ -415,7 +415,7 @@ libFLAC++.so.6 libflac-1.2.1_1 libMAC.so.6 libMAC-5.28_1 libmad.so.0 libmad-0.15.1b_1 libmatroska.so.7 libmatroska-1.6.0_1 -libmatrix_client.so.0.3.1 mtxclient-0.3.1_3 +libmatrix_client.so.0.4.1 mtxclient-0.4.1_1 libebml.so.5 libebml-1.4.0_1 libdvdread.so.8 libdvdread-6.1.1_1 libdvdnav.so.4 libdvdnav-4.1.3_1 diff --git a/srcpkgs/mtxclient/patches/fix_login_dendrite.patch b/srcpkgs/mtxclient/patches/fix_login_dendrite.patch new file mode 100644 index 000000000000..528e649c70e4 --- /dev/null +++ b/srcpkgs/mtxclient/patches/fix_login_dendrite.patch @@ -0,0 +1,16 @@ +Fix the bug that makes you unable to log in to a Dendrite server. This is +from upstream, so remove the patch in the next release + +diff --git lib/structs/responses/sync.cpp lib/structs/responses/sync.cpp +index 1c03a35..f810393 100644 +--- lib/structs/responses/sync.cpp ++++ lib/structs/responses/sync.cpp +@@ -189,7 +189,7 @@ from_json(const json &obj, Sync &response) + response.device_one_time_keys_count = + obj.at("device_one_time_keys_count").get>(); + +- if (obj.count("presence") != 0) { ++ if (obj.count("presence") != 0 && obj.at("presence").contains("events")) { + response.presence = + obj.at("presence") + .at("events") diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template index 5c5806d3cf7d..3089e33c162c 100644 --- a/srcpkgs/mtxclient/template +++ b/srcpkgs/mtxclient/template @@ -1,9 +1,9 @@ # Template file for 'mtxclient' pkgname=mtxclient -version=0.3.1 -revision=3 +version=0.4.1 +revision=1 build_style=cmake -configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON" +configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF" hostmakedepends="pkg-config" makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel" short_desc="Client API library for the Matrix protocol" @@ -11,7 +11,7 @@ maintainer="Lorem " license="MIT" homepage="https://github.com/Nheko-Reborn/mtxclient" distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz" -checksum=e4899cc4ce87397de2aef865e94ea2cdb8d9cb86253727e7d90532b925ecc770 +checksum=edd2ac051cf8019579942107fd32ec67dbf3581829954b5cca07e74431b9770a post_install() { vlicense LICENSE From 06087d13588dc4bc749764a5142d3c7417930883 Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Mon, 8 Mar 2021 14:15:14 +0300 Subject: [PATCH 2/2] nheko: update to 0.8.1 --- common/shlibs | 1 + srcpkgs/nheko/template | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 384755df8266..8409e6b3c508 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1159,6 +1159,7 @@ libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2 libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2 +libgstwebrtc-1.0.so.0 gst-plugins-bad1-1.18.4_2 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1 libsecret-1.so.0 libsecret-0.10_1 diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template index dd635f70f249..4aaaa12c4522 100644 --- a/srcpkgs/nheko/template +++ b/srcpkgs/nheko/template @@ -1,12 +1,13 @@ # Template file for 'nheko' pkgname=nheko -version=0.7.2 -revision=3 +version=0.8.1 +revision=1 build_style=cmake hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative" makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel tweeny spdlog mtxclient-devel boost-devel cmark-devel olm-devel json-c++ - libsodium-devel lmdb++ qt5-declarative-devel qt5-quickcontrols2-devel" + lmdb++ qt5-declarative-devel qt5-quickcontrols2-devel qtkeychain-qt5-devel + gst-plugins-bad1-devel gst-plugins-base1-devel" depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects qt5-multimedia" short_desc="Desktop client for Matrix using Qt and C++14" @@ -15,4 +16,4 @@ license="GPL-3.0-or-later" homepage="https://github.com/Nheko-Reborn/nheko" changelog="https://github.com/Nheko-Reborn/nheko/blob/master/CHANGELOG.md" distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz" -checksum=412908fcec0e66a0557db5359556b65e85dd22b8644a6a2ed569a90dea4bde3c +checksum=c9e11b763f39d18a899125678daa7a05cd80aa6acfcad0329485c2034f4a4d27