From 256e7fab0b358fd7d3c7b758554cf24b066fad1b Mon Sep 17 00:00:00 2001 From: Christian Heusel Date: Mon, 9 Sep 2024 20:52:05 +0200 Subject: [PATCH] upgpkg: 0.12.0-6: Rebuild for fmt 11 --- .SRCINFO | 6 +++++- PKGBUILD | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 633eba6..17c46fd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nheko pkgdesc = Desktop client for the Matrix protocol pkgver = 0.12.0 - pkgrel = 5 + pkgrel = 6 url = https://nheko.im/nheko-reborn/nheko arch = x86_64 license = GPL-3.0-or-later @@ -37,7 +37,11 @@ pkgbase = nheko 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 + 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 sha512sums = 2b69fa093168c9af9c43b7791f4186d0409caed1f272ca72e0e932da03ffb9ceb5609a495d4d7978f8b5666340aa97f358f904c7c61c67b6bd7221093c3cb66c + sha512sums = 54d028096c65a68bce883ad9ccc7e0b9da850bfa1c40b4029e9c79b2dd0052cc3dec2a9cd4b103c0d04e59256633f0370c67cff5efb24a6eb370c0c76b89380b + sha512sums = a801cd3f3a61d8370b1f8a49a7368b681ee43256d98c2b726ba62d7ea63827d8da5ec1c7fb92b0e5e6c2c6bf1018a154c1988d4b88dec3b92d3397a039526197 pkgname = nheko depends = qt6-base diff --git a/PKGBUILD b/PKGBUILD index 105fcc9..ee3e413 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=nheko pkgver=0.12.0 -pkgrel=5 +pkgrel=6 pkgdesc="Desktop client for the Matrix protocol" arch=('x86_64') url="https://nheko.im/nheko-reborn/nheko" @@ -23,8 +23,17 @@ 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") -sha512sums=('2b69fa093168c9af9c43b7791f4186d0409caed1f272ca72e0e932da03ffb9ceb5609a495d4d7978f8b5666340aa97f358f904c7c61c67b6bd7221093c3cb66c') +source=("$pkgname-$pkgver.tar.gz::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) +sha512sums=('2b69fa093168c9af9c43b7791f4186d0409caed1f272ca72e0e932da03ffb9ceb5609a495d4d7978f8b5666340aa97f358f904c7c61c67b6bd7221093c3cb66c' + '54d028096c65a68bce883ad9ccc7e0b9da850bfa1c40b4029e9c79b2dd0052cc3dec2a9cd4b103c0d04e59256633f0370c67cff5efb24a6eb370c0c76b89380b' + 'a801cd3f3a61d8370b1f8a49a7368b681ee43256d98c2b726ba62d7ea63827d8da5ec1c7fb92b0e5e6c2c6bf1018a154c1988d4b88dec3b92d3397a039526197') + +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" +} build() { cmake \