From: not-chicken <not-chicken@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] nheko: add upstream patch; fix depends
Date: Wed, 06 May 2020 17:32:33 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21690@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 601 bytes --]
There is a new pull request by not-chicken against master on the void-packages repository
https://github.com/not-chicken/void-packages nhekodep
https://github.com/void-linux/void-packages/pull/21690
nheko: add upstream patch; fix depends
- Added qt5-multimedia as a runtime dependency,
without it the chat pages would be blank.
- Added upstream patch to fix encoding of invite links.
Sorry for second bump regarding depends post last release, I will test runtime deps for pkgs more throughly in future.
A patch file from https://github.com/void-linux/void-packages/pull/21690.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nhekodep-21690.patch --]
[-- Type: text/x-diff, Size: 2212 bytes --]
From 53c5791e2fbc2d020657dab3d54934d72fb10667 Mon Sep 17 00:00:00 2001
From: Lorem <notloremipsum@protonmail.com>
Date: Wed, 6 May 2020 20:37:27 +0530
Subject: [PATCH] nheko: add upstream patch; fix depends
Added qt5-multimedia as a runtime dependency,
without it the chat pages would be blank.
Added patch to fix encoding of invite links.
---
srcpkgs/nheko/patches/fix_invites.patch | 14 ++++++++++++++
srcpkgs/nheko/template | 5 +++--
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/nheko/patches/fix_invites.patch
diff --git a/srcpkgs/nheko/patches/fix_invites.patch b/srcpkgs/nheko/patches/fix_invites.patch
new file mode 100644
index 00000000000..95a68cf7b0c
--- /dev/null
+++ b/srcpkgs/nheko/patches/fix_invites.patch
@@ -0,0 +1,14 @@
+Reason: Fix double percent encoding of invites
+Upstream: Taken from upstream commit https://github.com/Nheko-Reborn/nheko/commit/d94ac8
+--- src/ChatPage.cpp.orig
++++ src/ChatPage.cpp
+@@ -1015,8 +1015,7 @@
+ void
+ ChatPage::joinRoom(const QString &room)
+ {
+- // Percent escape the room ID
+- const auto room_id = QUrl::toPercentEncoding(room).toStdString();
++ const auto room_id = room.toStdString();
+
+ http::client()->join_room(
+ room_id, [this, room_id](const nlohmann::json &, mtx::http::RequestErr err) {
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 093d1deae5d..972ae2fddfb 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,13 +1,14 @@
# Template file for 'nheko'
pkgname=nheko
version=0.7.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel
tweeny spdlog mtxclient-devel boost-devel cmark-devel olm-devel json-c++
libsodium-devel lmdb++ qt5-declarative-devel qt5-quickcontrols2-devel"
-depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects"
+depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects
+ qt5-multimedia"
short_desc="Desktop client for Matrix using Qt and C++14"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-or-later"
next reply other threads:[~2020-05-06 15:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 15:32 not-chicken [this message]
2020-05-06 16:51 ` [PR PATCH] [Merged]: " Chocimier
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21690@inbox.vuxu.org \
--to=not-chicken@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).