Date: Wednesday, February 5, 2020 @ 18:32:14 Author: arojas Revision: 563362
Update to 1.7.0 Added: choqok/trunk/choqok-retweet.patch Modified: choqok/trunk/PKGBUILD ----------------------+ PKGBUILD | 35 +++++++++++++++++++---------------- choqok-retweet.patch | 23 +++++++++++++++++++++++ 2 files changed, 42 insertions(+), 16 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-02-05 17:05:47 UTC (rev 563361) +++ PKGBUILD 2020-02-05 18:32:14 UTC (rev 563362) @@ -1,3 +1,4 @@ +# Maintainer: Antonio Rojas <[email protected]> # Contributor: Peter Richard Lewis <[email protected]> # Contributor: Andrea Scarpino <[email protected]> # Contributor: Emanuele Rossi <[email protected]> @@ -4,30 +5,32 @@ # Contributor: Bram Schoenmakers <[email protected]> pkgname=choqok -pkgver=1.6.0 -pkgrel=2 -pkgdesc="A Twitter/Pump.io/GNU social client for KDE" -url='https://choqok.gnufolks.org/' -license=('GPL') -arch=('x86_64') -depends=('qoauth' 'knotifyconfig' 'kcmutils' 'kemoticons' 'kdewebkit' 'hicolor-icon-theme') -makedepends=('extra-cmake-modules' 'telepathy-qt' 'kdoctools') +pkgver=1.7.0 +pkgrel=1 +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) +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}) -md5sums=('f61ff13a748a78bb01433c5419c7cc13' - 'SKIP') +source=("https://download.kde.org/stable/$pkgname/${pkgver%.*}/src/$pkgname-$pkgver.tar.xz"{,.sig} + choqok-retweet.patch) +sha256sums=('26600d95f152c3e04881efb7fb3eb07b5c52fa6ffee838690f28b45defb4a47e' + 'SKIP' + 'da3d892c3bbc5736ec19dffb72286fb90623fb24c6dfee1fba6c105fdf235453') validpgpkeys=('2C7849767F14C23890B12791918F7DDFFD8D0B6E') # Andrea Scarpino <[email protected]> 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 } build() { cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDE_INSTALL_LIBDIR=lib \ + cmake ../$pkgname-$pkgver \ -DBUILD_TESTING=OFF make } @@ -34,5 +37,5 @@ package() { cd build - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } Added: choqok-retweet.patch =================================================================== --- choqok-retweet.patch (rev 0) +++ choqok-retweet.patch 2020-02-05 18:32:14 UTC (rev 563362) @@ -0,0 +1,23 @@ +diff --git a/microblogs/twitter/twittermicroblog.cpp b/microblogs/twitter/twittermicroblog.cpp +index 4052f611..6a9f8c98 100644 +--- a/microblogs/twitter/twittermicroblog.cpp ++++ b/microblogs/twitter/twittermicroblog.cpp +@@ -468,12 +468,16 @@ Choqok::Post *TwitterMicroBlog::readPost(Choqok::Account *account, const QVarian + post->replyToUser.userId = var[QLatin1String("in_reply_to_user_id_str")].toString(); + + // Support for extended tweet_mode +- if (var.contains(QLatin1String("full_text"))) { ++ if (var.contains(QLatin1String("full_text")) && post->repeatedPostId.isEmpty()) { + post->content = var[QLatin1String("full_text")].toString(); + } + + //postId is changed, regenerate link url +- post->link = postUrl(account, post->author.userName, post->postId); ++ if (!post->repeatedPostId.isEmpty()) { ++ post->link = postUrl(account, post->author.userName, post->repeatedPostId); ++ } else { ++ post->link = postUrl(account, post->author.userName, post->postId); ++ } + + QVariantMap userMap = var[QLatin1String("user")].toMap(); + post->author.userId = userMap[QLatin1String("id_str")].toString();
