From 36216dfb811cb57da8768f417fb3cef0460e1a83 Mon Sep 17 00:00:00 2001 From: Dominic Date: Tue, 19 Nov 2024 21:50:48 +0100 Subject: [PATCH] nheko-scrollfix 0.12.0-1 --- .SRCINFO | 16 ++++++++++++---- PKGBUILD | 30 +++++++++++++++++++----------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index af06b2b..315de9f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ -pkgbase = nheko +pkgbase = nheko-scrollfix pkgdesc = Desktop client for the Matrix protocol pkgver = 0.12.0 - pkgrel = 8 + pkgrel = 1 url = https://nheko.im/nheko-reborn/nheko arch = x86_64 license = GPL-3.0-or-later @@ -28,6 +28,8 @@ pkgbase = nheko depends = kdsingleapplication depends = gst-plugins-bad-libs depends = org.freedesktop.secrets + depends = kirigami + depends = openmp optdepends = qt6-jdenticon: Auto-generated profile pictures (identicons) optdepends = kimageformats: Extends the formats nheko supports for image attachments optdepends = gst-plugins-base-libs: VoIP/Video calls @@ -36,14 +38,18 @@ pkgbase = nheko optdepends = libnice: VoIP/Video calls optdepends = gst-libav: Video messages optdepends = gst-plugin-qml6: Video calls support - source = nheko-0.12.0.tar.gz::https://nheko.im/nheko-reborn/nheko/-/archive/v0.12.0/nheko-v0.12.0.tar.gz + provides = nheko=0.12.0 + conflicts = nheko + source = https://nheko.im/nheko-reborn/nheko/-/archive/v0.12.0/nheko-v0.12.0.tar.gz source = nheko-0_12_0-fix-fmt11-build-error1.patch::https://nheko.im/nheko-reborn/nheko/-/commit/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch source = nheko-0_12_0-fix-fmt11-build-error2.patch::https://nheko.im/nheko-reborn/nheko/-/commit/2d9142d491fed4feed00342193adfc7a268ce71d.patch + source = https://github.com/Nheko-Reborn/nheko/pull/1838/commits/c9f1a449d825d5879735f95ebfb0c7acec101226.patch sha512sums = 2b69fa093168c9af9c43b7791f4186d0409caed1f272ca72e0e932da03ffb9ceb5609a495d4d7978f8b5666340aa97f358f904c7c61c67b6bd7221093c3cb66c sha512sums = 54d028096c65a68bce883ad9ccc7e0b9da850bfa1c40b4029e9c79b2dd0052cc3dec2a9cd4b103c0d04e59256633f0370c67cff5efb24a6eb370c0c76b89380b sha512sums = a801cd3f3a61d8370b1f8a49a7368b681ee43256d98c2b726ba62d7ea63827d8da5ec1c7fb92b0e5e6c2c6bf1018a154c1988d4b88dec3b92d3397a039526197 + sha512sums = b34d5d21eba8dcc347a3ee1e78489c0fbd1c03db92a73bd985ff5490635630d6a0b41cef549de492a4d4492d88241051a852e59579df7fc623181cff9a5e7099 -pkgname = nheko +pkgname = nheko-scrollfix depends = qt6-base depends = qt6-svg depends = qt6-multimedia @@ -59,6 +65,8 @@ pkgname = nheko depends = kdsingleapplication depends = gst-plugins-bad-libs depends = org.freedesktop.secrets + depends = kirigami + depends = openmp depends = mtxclient depends = libmatrix_client.so depends = spdlog diff --git a/PKGBUILD b/PKGBUILD index 09b272d..c6a74e2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,18 +1,23 @@ -# Maintainer: Leonidas Spyropoulos +# Maintainer: Dominic Meiser +# Contributor: Leonidas Spyropoulos # Contributor: David Runge # Contributor: Luca Weiss # Contributor: Konstantinos Sideris -pkgname=nheko +_pkgname=nheko +pkgname=$_pkgname-scrollfix pkgver=0.12.0 -pkgrel=8 +pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=('x86_64') url="https://nheko.im/nheko-reborn/nheko" license=(GPL-3.0-or-later) +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") depends=(qt6-base qt6-svg qt6-multimedia qtkeychain-qt6 \ qt6-declarative qt6-imageformats coeurl mtxclient lmdb cmark libolm hicolor-icon-theme \ - kdsingleapplication gst-plugins-bad-libs 'org.freedesktop.secrets') + kdsingleapplication gst-plugins-bad-libs 'org.freedesktop.secrets' + kirigami openmp) makedepends=("git" "cmake" "gcc" "fontconfig" "qt6-tools" "nlohmann-json" "asciidoc") optdepends=('qt6-jdenticon: Auto-generated profile pictures (identicons)' 'kimageformats: Extends the formats nheko supports for image attachments' @@ -23,23 +28,26 @@ optdepends=('qt6-jdenticon: Auto-generated profile pictures (identicons)' 'gst-libav: Video messages' 'gst-plugin-qml6: Video calls support') 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=("https://nheko.im/nheko-reborn/$_pkgname/-/archive/v$pkgver/$_pkgname-v$pkgver.tar.gz" nheko-0_12_0-fix-fmt11-build-error1.patch::https://nheko.im/nheko-reborn/nheko/-/commit/8ff28245275eeb0cfe4ed40bd62b97cebbce4861.patch - nheko-0_12_0-fix-fmt11-build-error2.patch::https://nheko.im/nheko-reborn/nheko/-/commit/2d9142d491fed4feed00342193adfc7a268ce71d.patch) + nheko-0_12_0-fix-fmt11-build-error2.patch::https://nheko.im/nheko-reborn/nheko/-/commit/2d9142d491fed4feed00342193adfc7a268ce71d.patch + https://github.com/Nheko-Reborn/$_pkgname/pull/1838/commits/c9f1a449d825d5879735f95ebfb0c7acec101226.patch) sha512sums=('2b69fa093168c9af9c43b7791f4186d0409caed1f272ca72e0e932da03ffb9ceb5609a495d4d7978f8b5666340aa97f358f904c7c61c67b6bd7221093c3cb66c' '54d028096c65a68bce883ad9ccc7e0b9da850bfa1c40b4029e9c79b2dd0052cc3dec2a9cd4b103c0d04e59256633f0370c67cff5efb24a6eb370c0c76b89380b' - 'a801cd3f3a61d8370b1f8a49a7368b681ee43256d98c2b726ba62d7ea63827d8da5ec1c7fb92b0e5e6c2c6bf1018a154c1988d4b88dec3b92d3397a039526197') + 'a801cd3f3a61d8370b1f8a49a7368b681ee43256d98c2b726ba62d7ea63827d8da5ec1c7fb92b0e5e6c2c6bf1018a154c1988d4b88dec3b92d3397a039526197' + 'b34d5d21eba8dcc347a3ee1e78489c0fbd1c03db92a73bd985ff5490635630d6a0b41cef549de492a4d4492d88241051a852e59579df7fc623181cff9a5e7099') prepare() { - patch -Np1 -d "$pkgname-v$pkgver" -i "${srcdir}/nheko-0_12_0-fix-fmt11-build-error1.patch" - patch -Np1 -d "$pkgname-v$pkgver" -i "${srcdir}/nheko-0_12_0-fix-fmt11-build-error2.patch" + patch -Np1 -d "$_pkgname-v$pkgver" -i "$srcdir/nheko-0_12_0-fix-fmt11-build-error1.patch" + patch -Np1 -d "$_pkgname-v$pkgver" -i "$srcdir/nheko-0_12_0-fix-fmt11-build-error2.patch" + patch -Np1 -d "$_pkgname-v$pkgver" -i "$srcdir/c9f1a449d825d5879735f95ebfb0c7acec101226.patch" } build() { cmake \ -Bbuild \ -GNinja \ - -S "$pkgname-v$pkgver" \ + -S "$_pkgname-v$pkgver" \ -DCMAKE_BUILD_TYPE='None' \ -DCMAKE_INSTALL_PREFIX='/usr' \ -DCMAKE_INSTALL_LIBDIR='lib' \ @@ -58,6 +66,6 @@ package() { # cmark libcmark.so # https://bugs.archlinux.org/task/77538 libolm libolm.so ) - DESTDIR="${pkgdir}" cmake --install build + DESTDIR="$pkgdir" cmake --install build }