aur/nheko-scrollfix
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

upgpkg: 0.12.0-1: new upstream release

Browse source
This commit is contained in:
Leonidas Spyropoulos 2024-06-12 00:13:57 +01:00
parent 56b476cf7b
commit 06e83997ce
No known key found for this signature in database
GPG key ID: 244740D17C7FD0EC
3 changed files with 30 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
.SRCINFO
View file

@ -1,30 +1,32 @@
pkgbase = nheko pkgbase = nheko
pkgdesc = Desktop client for the Matrix protocol pkgdesc = Desktop client for the Matrix protocol
pkgver = 0.11.3 pkgver = 0.12.0
pkgrel = 11 pkgrel = 1
url = https://nheko.im/nheko-reborn/nheko url = https://nheko.im/nheko-reborn/nheko
arch = x86_64 arch = x86_64
license = GPL-3.0-or-later license = GPL-3.0-or-later
makedepends = cmake makedepends = cmake
makedepends = ninja makedepends = ninja
makedepends = qt5-tools makedepends = qt6-tools
makedepends = fontconfig makedepends = fontconfig
makedepends = nlohmann-json makedepends = nlohmann-json
makedepends = asciidoc makedepends = asciidoc
makedepends = lmdbxx makedepends = lmdbxx
makedepends = spdlog makedepends = spdlog
depends = qt5-svg depends = qt6-base
depends = qt5-quickcontrols2 depends = qt6-svg
depends = qt5-graphicaleffects depends = qt6-quickcontrols2
depends = qt5-multimedia depends = qt6-multimedia
depends = qtkeychain-qt5 depends = qtkeychain-qt6
depends = qt5-imageformats depends = qt6-declarative
depends = qt6-imageformats
depends = coeurl depends = coeurl
depends = mtxclient depends = mtxclient
depends = lmdb depends = lmdb
depends = cmark depends = cmark
depends = libolm depends = libolm
depends = hicolor-icon-theme depends = hicolor-icon-theme
depends = kdsingleapplication
depends = gst-plugins-bad-libs depends = gst-plugins-bad-libs
depends = org.freedesktop.secrets depends = org.freedesktop.secrets
optdepends = qt-jdenticon: Auto-generated profile pictures (identicons) optdepends = qt-jdenticon: Auto-generated profile pictures (identicons)
@ -35,26 +37,24 @@ pkgbase = nheko
optdepends = libnice: VoIP/Video calls optdepends = libnice: VoIP/Video calls
optdepends = gst-libav: Video messages optdepends = gst-libav: Video messages
optdepends = gst-plugin-qmlgl: Video calls and Screen sharing optdepends = gst-plugin-qmlgl: Video calls and Screen sharing
source = nheko-0.11.3.tar.gz::https://nheko.im/nheko-reborn/nheko/-/archive/v0.11.3/nheko-v0.11.3.tar.gz source = nheko-0.12.0.tar.gz::https://nheko.im/nheko-reborn/nheko/-/archive/v0.12.0/nheko-v0.12.0.tar.gz
source = nheko-0.11.3-fix-for-fmt-10.patch sha512sums = 2b69fa093168c9af9c43b7791f4186d0409caed1f272ca72e0e932da03ffb9ceb5609a495d4d7978f8b5666340aa97f358f904c7c61c67b6bd7221093c3cb66c
source = nheko-0.11.3-fix-for-fmt-10.1.patch::https://nheko.im/nheko-reborn/nheko/-/commit/871e403f6799df48cfbbe08eba56d473a0c34216.patch
sha512sums = b305c1f9045469d8163ea9d851b74f524578cecfd4463e1c2f1a62206b7bf308e4cf537930e03f7f565edc1f72ef12ad9fc8d3950a73fdd11c35ae4fc62f8d2d
sha512sums = 67c630939ed11611038a12f13270bb43f8d52f4ffbac35b94f7ffee145ae4d2387ac462cc8b63857d661e4d8a92d77f32ff29222bd47fd61546ca6f214d0f7f9
sha512sums = 4c9b0e4f4521a398721c06eefb633c128bbadf5cf5e3480bfc0e1cdbf733f669c46ef7ebd372e66b3b45ddb9e66644af1bb3f81d7b616f3f7203e9c4bcc4628e
pkgname = nheko pkgname = nheko
depends = qt5-svg depends = qt6-base
depends = qt5-quickcontrols2 depends = qt6-svg
depends = qt5-graphicaleffects depends = qt6-quickcontrols2
depends = qt5-multimedia depends = qt6-multimedia
depends = qtkeychain-qt5 depends = qtkeychain-qt6
depends = qt5-imageformats depends = qt6-declarative
depends = qt6-imageformats
depends = coeurl depends = coeurl
depends = mtxclient depends = mtxclient
depends = lmdb depends = lmdb
depends = cmark depends = cmark
depends = libolm depends = libolm
depends = hicolor-icon-theme depends = hicolor-icon-theme
depends = kdsingleapplication
depends = gst-plugins-bad-libs depends = gst-plugins-bad-libs
depends = org.freedesktop.secrets depends = org.freedesktop.secrets
depends = mtxclient depends = mtxclient

27
PKGBUILD
View file

@ -4,15 +4,16 @@
# Contributor: Konstantinos Sideris <siderisk at auth dot gr> # Contributor: Konstantinos Sideris <siderisk at auth dot gr>
pkgname=nheko pkgname=nheko
pkgver=0.11.3 pkgver=0.12.0
pkgrel=11 pkgrel=1
pkgdesc="Desktop client for the Matrix protocol" pkgdesc="Desktop client for the Matrix protocol"
arch=('x86_64') arch=('x86_64')
url="https://nheko.im/nheko-reborn/nheko" url="https://nheko.im/nheko-reborn/nheko"
license=(GPL-3.0-or-later) license=(GPL-3.0-or-later)
depends=(qt5-svg qt5-quickcontrols2 qt5-graphicaleffects qt5-multimedia qtkeychain-qt5 \ depends=(qt6-base qt6-svg qt6-quickcontrols2 qt6-multimedia qtkeychain-qt6 \
qt5-imageformats coeurl mtxclient lmdb cmark libolm hicolor-icon-theme \ qt6-declarative qt6-imageformats coeurl mtxclient lmdb cmark libolm hicolor-icon-theme \
gst-plugins-bad-libs 'org.freedesktop.secrets') kdsingleapplication gst-plugins-bad-libs 'org.freedesktop.secrets')
makedepends=("git" "cmake" "gcc" "fontconfig" "qt6-tools" "nlohmann-json" "asciidoc")
optdepends=('qt-jdenticon: Auto-generated profile pictures (identicons)' optdepends=('qt-jdenticon: Auto-generated profile pictures (identicons)'
'kimageformats: Extends the formats nheko supports for image attachments' 'kimageformats: Extends the formats nheko supports for image attachments'
'gst-plugins-base-libs: VoIP/Video calls' 'gst-plugins-base-libs: VoIP/Video calls'
@ -21,19 +22,9 @@ optdepends=('qt-jdenticon: Auto-generated profile pictures (identicons)'
'libnice: VoIP/Video calls' 'libnice: VoIP/Video calls'
'gst-libav: Video messages' 'gst-libav: Video messages'
'gst-plugin-qmlgl: Video calls and Screen sharing') 'gst-plugin-qmlgl: Video calls and Screen sharing')
makedepends=(cmake ninja qt5-tools fontconfig nlohmann-json asciidoc lmdbxx spdlog) makedepends=(cmake ninja qt6-tools fontconfig nlohmann-json asciidoc lmdbxx spdlog)
source=("$pkgname-$pkgver.tar.gz::https://nheko.im/nheko-reborn/${pkgname}/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz" source=("$pkgname-$pkgver.tar.gz::https://nheko.im/nheko-reborn/${pkgname}/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz")
"$pkgname-$pkgver-fix-for-fmt-10.patch" sha512sums=('2b69fa093168c9af9c43b7791f4186d0409caed1f272ca72e0e932da03ffb9ceb5609a495d4d7978f8b5666340aa97f358f904c7c61c67b6bd7221093c3cb66c')
"$pkgname-$pkgver-fix-for-fmt-10.1.patch::https://nheko.im/nheko-reborn/nheko/-/commit/871e403f6799df48cfbbe08eba56d473a0c34216.patch")
sha512sums=('b305c1f9045469d8163ea9d851b74f524578cecfd4463e1c2f1a62206b7bf308e4cf537930e03f7f565edc1f72ef12ad9fc8d3950a73fdd11c35ae4fc62f8d2d'
'67c630939ed11611038a12f13270bb43f8d52f4ffbac35b94f7ffee145ae4d2387ac462cc8b63857d661e4d8a92d77f32ff29222bd47fd61546ca6f214d0f7f9'
'4c9b0e4f4521a398721c06eefb633c128bbadf5cf5e3480bfc0e1cdbf733f669c46ef7ebd372e66b3b45ddb9e66644af1bb3f81d7b616f3f7203e9c4bcc4628e')
prepare(){
cd "$pkgname-v$pkgver"
patch -Np1 < "../$pkgname-$pkgver-fix-for-fmt-10.patch"
patch -Np1 < "../$pkgname-$pkgver-fix-for-fmt-10.1.patch"
}
build() { build() {
cmake \ cmake \

81
nheko-0.11.3-fix-for-fmt-10.patch
View file

@ -1,81 +0,0 @@
From e89e65dc17020772eb057414b4f0c5d6f4ad98d0 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 28 Jun 2023 13:16:10 +0200
Subject: [PATCH] Fix build against fmt10
fixes #1499
---
src/Cache.cpp | 2 +-
src/encryption/DeviceVerificationFlow.cpp | 2 +-
src/timeline/InputBar.cpp | 10 ++++++----
src/ui/MxcMediaProxy.cpp | 9 ++++++---
4 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/Cache.cpp b/src/Cache.cpp
index f4aad6b3a..7a19cba4d 100644
--- a/src/Cache.cpp
+++ b/src/Cache.cpp
@@ -434,7 +434,7 @@ Cache::loadSecretsFromStore(
if (job->error() && job->error() != QKeychain::Error::EntryNotFound) {
nhlog::db()->error("Restoring secret '{}' failed ({}): {}",
name.toStdString(),
- job->error(),
+ static_cast<int>(job->error()),
job->errorString().toStdString());
fatalSecretError();
diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
index a240a095c..1e7ed7bcc 100644
--- a/src/encryption/DeviceVerificationFlow.cpp
+++ b/src/encryption/DeviceVerificationFlow.cpp
@@ -37,7 +37,7 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *,
, deviceIds(std::move(deviceIds_))
, model_(model)
{
- nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", flow_type, (void *)this);
+ nhlog::crypto()->debug("CREATING NEW FLOW, {}, {}", static_cast<int>(flow_type), (void *)this);
if (deviceIds.size() == 1)
deviceId = deviceIds.front();
diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp
index 2f3b6eae8..a59bc4c61 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -948,14 +948,14 @@
this,
[mediaPlayer](QMediaPlayer::Error error) {
nhlog::ui()->debug("Media player error {} and errorStr {}",
- error,
+ static_cast<int>(error),
mediaPlayer->errorString().toStdString());
});
connect(mediaPlayer,
&QMediaPlayer::mediaStatusChanged,
[mediaPlayer](QMediaPlayer::MediaStatus status) {
nhlog::ui()->debug(
- "Media player status {} and error {}", status, mediaPlayer->error());
+ "Media player status {} and error {}", static_cast<int>(status), static_cast<int>(mediaPlayer->error()));
});
connect(mediaPlayer,
qOverload<const QString &, const QVariant &>(&QMediaPlayer::metaDataChanged),
diff --git a/src/ui/MxcMediaProxy.cpp b/src/ui/MxcMediaProxy.cpp
index 2adf25387..5fae0654f 100644
--- a/src/ui/MxcMediaProxy.cpp
+++ b/src/ui/MxcMediaProxy.cpp
@@ -37,11 +37,11 @@
qOverload<QMediaPlayer::Error>(&MxcMediaProxy::error),
[this](QMediaPlayer::Error error) {
nhlog::ui()->info("Media player error {} and errorStr {}",
- error,
+ static_cast<int>(error),
this->errorString().toStdString());
});
connect(this, &MxcMediaProxy::mediaStatusChanged, [this](QMediaPlayer::MediaStatus status) {
- nhlog::ui()->info("Media player status {} and error {}", status, this->error());
+ nhlog::ui()->info("Media player status {} and error {}", static_cast<int>(status), static_cast<int>(this->error()));
});
connect(this,
qOverload<const QString &, const QVariant &>(&MxcMediaProxy::metaDataChanged),
--
GitLab