[arch-commits] Commit in choqok/repos/community-x86_64 (6 files)
Antonio Rojas
arojas at archlinux.org
Thu Aug 27 21:33:15 UTC 2020
Date: Thursday, August 27, 2020 @ 21:33:14
Author: arojas
Revision: 690051
archrelease: copy trunk to community-x86_64
Added:
choqok/repos/community-x86_64/PKGBUILD
(from rev 690050, choqok/trunk/PKGBUILD)
choqok/repos/community-x86_64/choqok-conversation.patch
(from rev 690050, choqok/trunk/choqok-conversation.patch)
choqok/repos/community-x86_64/choqok-retweet.patch
(from rev 690050, choqok/trunk/choqok-retweet.patch)
Deleted:
choqok/repos/community-x86_64/PKGBUILD
choqok/repos/community-x86_64/choqok-conversation.patch
choqok/repos/community-x86_64/choqok-retweet.patch
---------------------------+
PKGBUILD | 88 ++++++++++++++++++++++----------------------
choqok-conversation.patch | 42 ++++++++++-----------
choqok-retweet.patch | 46 +++++++++++------------
3 files changed, 89 insertions(+), 87 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-08-27 21:33:01 UTC (rev 690050)
+++ PKGBUILD 2020-08-27 21:33:14 UTC (rev 690051)
@@ -1,43 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Peter Richard Lewis <plewis at aur.archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Emanuele Rossi <newdna1510 at yahoo.it>
-# Contributor: Bram Schoenmakers <me at bramschoenmakers.nl>
-
-pkgname=choqok
-pkgver=1.7.0
-pkgrel=2
-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}
- choqok-retweet.patch choqok-conversation.patch)
-sha256sums=('26600d95f152c3e04881efb7fb3eb07b5c52fa6ffee838690f28b45defb4a47e'
- 'SKIP'
- 'da3d892c3bbc5736ec19dffb72286fb90623fb24c6dfee1fba6c105fdf235453'
- '7fc1f8c5848e8c63b37651280f0ec1edec3b3685f91886a3d4f0650d19e8eba8')
-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
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: choqok/repos/community-x86_64/PKGBUILD (from rev 690050, choqok/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-08-27 21:33:14 UTC (rev 690051)
@@ -0,0 +1,45 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Peter Richard Lewis <plewis at aur.archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Emanuele Rossi <newdna1510 at yahoo.it>
+# Contributor: Bram Schoenmakers <me at bramschoenmakers.nl>
+
+pkgname=choqok
+pkgver=1.7.0
+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 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
+ 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'
+ 'ad9d4c1d854045d520d941b796c7573264cd9820be34b63e4e6e80ddaf3aacd3'
+ '0428fc70a1a0604f66c8d750dcee739ad0660d466166a772b6de14818a1446fe')
+validpgpkeys=('2C7849767F14C23890B12791918F7DDFFD8D0B6E') # Andrea Scarpino <me at andreascarpino.it>
+
+prepare() {
+ 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() {
+ cmake -B build -S $pkgname-$pkgver \
+ -DBUILD_TESTING=OFF
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
Deleted: choqok-conversation.patch
===================================================================
--- choqok-conversation.patch 2020-08-27 21:33:01 UTC (rev 690050)
+++ choqok-conversation.patch 2020-08-27 21:33:14 UTC (rev 690051)
@@ -1,21 +0,0 @@
-diff --git a/microblogs/twitter/twittermicroblog.cpp b/microblogs/twitter/twittermicroblog.cpp
-index 6a9f8c98..ff56e0f1 100644
---- a/microblogs/twitter/twittermicroblog.cpp
-+++ b/microblogs/twitter/twittermicroblog.cpp
-@@ -495,7 +495,6 @@ void TwitterMicroBlog::fetchPost(Choqok::Account *theAccount, Choqok::Post *post
- QUrl url = account->apiUrl();
- url.setPath(url.path() + QStringLiteral("/statuses/show/%1.json").arg(post->postId));
-
-- QUrl tmpUrl(url);
- QUrlQuery urlQuery;
- urlQuery.addQueryItem(QLatin1String("tweet_mode"), QLatin1String("extended"));
- url.setQuery(urlQuery);
-@@ -510,7 +509,7 @@ void TwitterMicroBlog::fetchPost(Choqok::Account *theAccount, Choqok::Post *post
- }
- job->addMetaData(QStringLiteral("customHTTPHeader"),
- QStringLiteral("Authorization: ") +
-- QLatin1String(authorizationHeader(account, tmpUrl, QNetworkAccessManager::GetOperation)));
-+ QLatin1String(authorizationHeader(account, url, QNetworkAccessManager::GetOperation)));
- mFetchPostMap[ job ] = post;
- mJobsAccount[ job ] = theAccount;
- connect(job, &KIO::StoredTransferJob::result, this, &TwitterMicroBlog::slotFetchPost);
Copied: choqok/repos/community-x86_64/choqok-conversation.patch (from rev 690050, choqok/trunk/choqok-conversation.patch)
===================================================================
--- choqok-conversation.patch (rev 0)
+++ choqok-conversation.patch 2020-08-27 21:33:14 UTC (rev 690051)
@@ -0,0 +1,21 @@
+diff --git a/microblogs/twitter/twittermicroblog.cpp b/microblogs/twitter/twittermicroblog.cpp
+index 6a9f8c98..ff56e0f1 100644
+--- a/microblogs/twitter/twittermicroblog.cpp
++++ b/microblogs/twitter/twittermicroblog.cpp
+@@ -495,7 +495,6 @@ void TwitterMicroBlog::fetchPost(Choqok::Account *theAccount, Choqok::Post *post
+ QUrl url = account->apiUrl();
+ url.setPath(url.path() + QStringLiteral("/statuses/show/%1.json").arg(post->postId));
+
+- QUrl tmpUrl(url);
+ QUrlQuery urlQuery;
+ urlQuery.addQueryItem(QLatin1String("tweet_mode"), QLatin1String("extended"));
+ url.setQuery(urlQuery);
+@@ -510,7 +509,7 @@ void TwitterMicroBlog::fetchPost(Choqok::Account *theAccount, Choqok::Post *post
+ }
+ job->addMetaData(QStringLiteral("customHTTPHeader"),
+ QStringLiteral("Authorization: ") +
+- QLatin1String(authorizationHeader(account, tmpUrl, QNetworkAccessManager::GetOperation)));
++ QLatin1String(authorizationHeader(account, url, QNetworkAccessManager::GetOperation)));
+ mFetchPostMap[ job ] = post;
+ mJobsAccount[ job ] = theAccount;
+ connect(job, &KIO::StoredTransferJob::result, this, &TwitterMicroBlog::slotFetchPost);
Deleted: choqok-retweet.patch
===================================================================
--- choqok-retweet.patch 2020-08-27 21:33:01 UTC (rev 690050)
+++ choqok-retweet.patch 2020-08-27 21:33:14 UTC (rev 690051)
@@ -1,23 +0,0 @@
-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();
Copied: choqok/repos/community-x86_64/choqok-retweet.patch (from rev 690050, choqok/trunk/choqok-retweet.patch)
===================================================================
--- choqok-retweet.patch (rev 0)
+++ choqok-retweet.patch 2020-08-27 21:33:14 UTC (rev 690051)
@@ -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();
More information about the arch-commits
mailing list