From: FollieHiyuki <FollieHiyuki@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] nheko: update to 0.8.1
Date: Wed, 17 Mar 2021 03:59:03 +0100 [thread overview]
Message-ID: <20210317025903.601bUNm3-TQitmpoWtiHag7FVoQnpGWdqQH4XtGP5_I@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29310@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1847 bytes --]
There is an updated pull request by FollieHiyuki against master on the void-packages repository
https://github.com/FollieHiyuki/void-packages nheko
https://github.com/void-linux/void-packages/pull/29310
[WIP] nheko: update to 0.8.1
BUILD_SHARED_LIBS is ON by default for `mtxclient`, so we don't need to specify it in `configure_args`
Gstreamer dependencies are for the experimental VoIP support.
Will try to spend a few days testing, hope I can get away from Element :)
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/29310.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nheko-29310.patch --]
[-- Type: text/x-diff, Size: 5188 bytes --]
From 402052156ef2bf5cc71911f6b7adb2ad78e71a62 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
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 bba9a0eb1939..1896d1e9e023 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,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<std::map<std::string, uint16_t>>();
+
+- 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 <notloremipsum@protonmail.com>"
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 691ec7c0c283d5e88c4a597c7ca6ddf47afb5899 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
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 1896d1e9e023..a66a9d43507d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1161,6 +1161,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.3_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
next prev parent reply other threads:[~2021-03-17 2:59 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 11:31 [PR PATCH] " FollieHiyuki
2021-03-08 12:02 ` [WIP] " FollieHiyuki
2021-03-08 12:56 ` FollieHiyuki
2021-03-17 2:59 ` FollieHiyuki [this message]
2021-03-17 3:06 ` FollieHiyuki
2021-04-07 19:28 ` [PR PATCH] [Updated] " FollieHiyuki
2021-04-23 21:09 ` FollieHiyuki
2021-04-23 21:12 ` FollieHiyuki
2021-04-24 8:29 ` not-chicken
2021-04-24 12:25 ` ericonr
2021-04-24 14:51 ` not-chicken
2021-04-24 15:21 ` [PR PATCH] [Updated] " FollieHiyuki
2021-04-24 15:24 ` FollieHiyuki
2021-04-24 15:26 ` FollieHiyuki
2021-04-24 15:31 ` FollieHiyuki
2021-04-24 17:11 ` ericonr
2021-04-24 20:46 ` [PR PATCH] [Updated] " FollieHiyuki
2021-04-24 20:50 ` FollieHiyuki
2021-04-24 20:55 ` FollieHiyuki
2021-04-25 0:51 ` [PR REVIEW] " ericonr
2021-04-25 13:03 ` [PR PATCH] [Updated] " FollieHiyuki
2021-04-25 13:03 ` [PR REVIEW] " FollieHiyuki
2021-04-26 14:32 ` ericonr
2021-04-26 18:41 ` FollieHiyuki
2021-04-26 18:43 ` nheko: update to 0.8.2 FollieHiyuki
2021-04-26 18:56 ` FollieHiyuki
2021-04-26 19:18 ` [PR REVIEW] " ericonr
2021-04-26 19:18 ` ericonr
2021-04-26 21:18 ` [PR PATCH] [Updated] " FollieHiyuki
2021-04-26 21:19 ` FollieHiyuki
2021-04-26 21:52 ` ericonr
2021-04-26 22:17 ` [PR PATCH] [Updated] " FollieHiyuki
2021-04-27 4:02 ` [PR REVIEW] " not-chicken
2021-04-27 4:06 ` not-chicken
2021-04-27 4:08 ` [PR PATCH] [Updated] " FollieHiyuki
2021-04-27 4:09 ` [PR REVIEW] " FollieHiyuki
2021-04-27 12:34 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210317025903.601bUNm3-TQitmpoWtiHag7FVoQnpGWdqQH4XtGP5_I@z \
--to=folliehiyuki@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).