Date: Tuesday, February 8, 2022 @ 16:37:48 Author: arojas Revision: 1129252
Update to 22.02 Modified: neochat/trunk/PKGBUILD Deleted: neochat/trunk/neochat-qcoro-0.4.patch -------------------------+ PKGBUILD | 16 +++++----------- neochat-qcoro-0.4.patch | 34 ---------------------------------- 2 files changed, 5 insertions(+), 45 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-02-08 16:30:39 UTC (rev 1129251) +++ PKGBUILD 2022-02-08 16:37:48 UTC (rev 1129252) @@ -2,8 +2,8 @@ # Contributor: derfenix <derfe...@gmail.com> pkgname=neochat -pkgver=21.12 -pkgrel=2 +pkgver=22.02 +pkgrel=1 pkgdesc='A client for matrix, the decentralized communication protocol' license=(GPL3) arch=(x86_64) @@ -10,18 +10,12 @@ url='https://apps.kde.org/neochat' depends=(qqc2-desktop-style libquotient kquickimageeditor kitemmodels kio syntax-highlighting qtkeychain-qt5 cmark hicolor-icon-theme) makedepends=(extra-cmake-modules qcoro-qt5) -source=(https://download.kde.org/stable/plasma-mobile/$pkgver/$pkgname-$pkgver.tar.xz{,.sig} - neochat-qcoro-0.4.patch) -sha256sums=('8393147b95fda221dc99034c2e72d5f91d8ba85cf6f5f5d2d29734c85028ab8a' - 'SKIP' - '9091c9994928052a60014d45f8c2f328155de326c78f39bc6d303263fdc3335c') +source=(https://download.kde.org/stable/plasma-mobile/$pkgver/$pkgname-$pkgver.tar.xz{,.sig}) +sha256sums=('be54a898ca1ac7be404be3d666859291669293ee1843917bf8cdcb385787609a' + 'SKIP') validpgpkeys=(B3ED0BAE371BEDA00717921D18F4795C1CE7042B # Carl Schwan <c...@carlschwan.eu> 0AAC775BB6437A8D9AF7A3ACFE0784117FBCE11D) # Bhushan Shah (mykolab address) <bs...@mykolab.com> -prepare() { - patch -d $pkgname-$pkgver -p1 < neochat-qcoro-0.4.patch # Support qcoro 0.4 -} - build() { cmake -B build -S $pkgname-$pkgver cmake --build build Deleted: neochat-qcoro-0.4.patch =================================================================== --- neochat-qcoro-0.4.patch 2022-02-08 16:30:39 UTC (rev 1129251) +++ neochat-qcoro-0.4.patch 2022-02-08 16:37:48 UTC (rev 1129252) @@ -1,34 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 58f9949..2303b24 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -108,7 +108,10 @@ set_package_properties(KQuickImageEditor PROPERTIES - PURPOSE "Add image editing capability to image attachments" - ) - --find_package(QCoro REQUIRED) -+find_package(QCoro5 COMPONENTS Coro QUIET) -+if(NOT QCoro5_FOUND) -+ find_package(QCoro REQUIRED) -+endif() - - qcoro_enable_coroutines() - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7ad3c88..54aab85 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -62,7 +62,12 @@ if(NOT ANDROID) - endif() - - target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR}) --target_link_libraries(neochat PRIVATE Qt::Quick Qt::Qml Qt::Gui Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::QCoro) -+target_link_libraries(neochat PRIVATE Qt::Quick Qt::Qml Qt::Gui Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES}) -+if(TARGET QCoro5::Coro) -+ target_link_libraries(neochat PRIVATE QCoro5::Coro) -+else() -+ target_link_libraries(neochat PRIVATE QCoro::QCoro) -+endif() - kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc) - - if(NEOCHAT_FLATPAK)