[arch-commits] Commit in choqok/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Thursday, August 27, 2020 @ 21:33:01
  Author: arojas
Revision: 690050

Backport some bug fixes

Modified:
  choqok/trunk/PKGBUILD

----------+
 PKGBUILD |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-27 21:30:20 UTC (rev 690049)
+++ PKGBUILD	2020-08-27 21:33:01 UTC (rev 690050)
@@ -6,38 +6,40 @@
 
 pkgname=choqok
 pkgver=1.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A micro-blogging client by the KDE community"
 url='https://choqok.kde.org/'
 license=(GPL)
 arch=(x86_64)
-depends=(qt5-networkauth qca knotifyconfig kcmutils kemoticons kdewebkit purpose hicolor-icon-theme)
+depends=(qt5-networkauth qca knotifyconfig kemoticons kdewebkit purpose)
 makedepends=(extra-cmake-modules telepathy-qt kdoctools)
 optdepends=('telepathy-qt: IMstatus plugin')
 source=("https://download.kde.org/stable/$pkgname/${pkgver%.*}/src/$pkgname-$pkgver.tar.xz"{,.sig}
-         choqok-retweet.patch choqok-conversation.patch)
+         choqok-retweet.patch
+         choqok-conversation.patch
+         kdebug-417297.patch::https://invent.kde.org/network/choqok/commit/cc0d6127.patch
+         kdebug-424938.patch::https://invent.kde.org/network/choqok/commit/360dc717.patch)
 sha256sums=('26600d95f152c3e04881efb7fb3eb07b5c52fa6ffee838690f28b45defb4a47e'
             'SKIP'
             'da3d892c3bbc5736ec19dffb72286fb90623fb24c6dfee1fba6c105fdf235453'
-            '7fc1f8c5848e8c63b37651280f0ec1edec3b3685f91886a3d4f0650d19e8eba8')
+            '7fc1f8c5848e8c63b37651280f0ec1edec3b3685f91886a3d4f0650d19e8eba8'
+            'ad9d4c1d854045d520d941b796c7573264cd9820be34b63e4e6e80ddaf3aacd3'
+            '0428fc70a1a0604f66c8d750dcee739ad0660d466166a772b6de14818a1446fe')
 validpgpkeys=('2C7849767F14C23890B12791918F7DDFFD8D0B6E') # Andrea Scarpino <me at andreascarpino.it>
 
 prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../choqok-retweet.patch # Fix retweet display https://bugs.kde.org/show_bug.cgi?id=370260
-  patch -p1 -i ../choqok-conversation.patch # Fix fetching conversations https://bugs.kde.org/show_bug.cgi?id=417193
+  patch -d $pkgname-$pkgver -p1 -i ../choqok-retweet.patch # Fix retweet display https://bugs.kde.org/show_bug.cgi?id=370260
+  patch -d $pkgname-$pkgver -p1 -i ../choqok-conversation.patch # Fix fetching conversations https://bugs.kde.org/show_bug.cgi?id=417193
+  patch -d $pkgname-$pkgver -p1 -i ../kdebug-417297.patch # Fix updating tweet timestamps https://bugs.kde.org/show_bug.cgi?id=417297
+  patch -d $pkgname-$pkgver -p1 -i ../kdebug-424938.patch # Fix layout of tweets that contain an imaged and a cited tweet
 }
 
 build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
+  cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }