diff options
Diffstat (limited to 'kde-apps/kblog')
| -rw-r--r-- | kde-apps/kblog/Manifest | 8 | ||||
| -rw-r--r-- | kde-apps/kblog/files/kblog-18.04.3-syndication.patch | 219 | ||||
| -rw-r--r-- | kde-apps/kblog/kblog-18.04.3.ebuild | 24 | ||||
| -rw-r--r-- | kde-apps/kblog/kblog-18.08.3.ebuild | 2 | ||||
| -rw-r--r-- | kde-apps/kblog/kblog-18.12.0.ebuild (renamed from kde-apps/kblog/kblog-18.04.3-r1.ebuild) | 4 |
5 files changed, 5 insertions, 252 deletions
diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest index 01301ed9265d..bdf9eb220b1f 100644 --- a/kde-apps/kblog/Manifest +++ b/kde-apps/kblog/Manifest @@ -1,7 +1,5 @@ -AUX kblog-18.04.3-syndication.patch 7655 BLAKE2B a2025972f39d3642eeb9a743f65f9c50865879a54ca3ca9da1a185578343beabb5f09763d96d0bd09ee750f5c925eb141aea2f8aeacd931212815260938c7835 SHA512 867791284a67d41ccdca77c2159a9ea348154455f12e3781138261653e869727aefbb9cc604c246870bd83d85766da1a8dcd134adafb9195001e5a5792a9099e -DIST kblog-18.04.3.tar.xz 72472 BLAKE2B e4460ad17033afba4be89f29348d5849d98455f4ab479f626cc59b44243932017ed546b0a3851e4615bb892ab33660018d44d8eff38621b62c6ee66fa36fd136 SHA512 c12df99b010a67a3b653a6a0c79209b37b03195b94df27e2bc805ae939f572df99c29e70a182fcce5aee8c792a7b48446e1e6f032493a420896dd39c207cafae DIST kblog-18.08.3.tar.xz 72956 BLAKE2B 0c084723c856ac09066046ee0ad456812929a15cdc57972f49dcf6b6b77a00c3c8f0f46150a0c6dec968cf8e6e50a97bdf03f3d3c47f0c0804c98aaea13651e0 SHA512 1a319774f8d76e59615276df785c3ac602eeb2c2bdae7db0d94d4a3ed5c67af19a670593ca1c4e5dbcf17a8769f1d4abf21ed609240f76d3e7b01010d73fea3c -EBUILD kblog-18.04.3-r1.ebuild 580 BLAKE2B 2d236c586c2506c74d908df6ec23b401befb6a10a648a8517a7ad1492695388c835c0ad8c408df18e2a1e5323b541c16c0c70f8fc3f1e7ee98dc55bd7e8c30b6 SHA512 ec9a8fad568612b466558498175bee5c085523b8b1e36c66e79137d9aae23e374653086572c21dd460ecbfa85e15b7a4837cd8047738be661bdeda75a6a3d745 -EBUILD kblog-18.04.3.ebuild 530 BLAKE2B 2a664bdebe9aed7515df9eb4535c850245632b331a23548c82421b96b592f4ece00334320e731e99ad7bb32e1d44f68e85770efe21805f4525f8989ec197a602 SHA512 cf8f8b2331184ddfd495519c39f2091e87c249c4662a1a0ec1d07bd00ec72b213f6e059821d6f9958545489fdd05764731a9d5aadfd12ed830ec1e2e8f7d3bf4 -EBUILD kblog-18.08.3.ebuild 532 BLAKE2B c14b0879987b0071f2aff503ffb5ce2566247731b6b76ce083ffdadb12f70738c96a4cc063530d09683aa4924db60eee5e1d48a74dd06ca8e93b2ef601c65781 SHA512 c802b0956385989b0cc2a1ef93b2dfe9987f1e6d5de50fc3f828b49a476c7d80ce6c68356c5ab39ad7aa59e6218f134c8bcc3e2b349afa060ea7d26fe17b678b +DIST kblog-18.12.0.tar.xz 72768 BLAKE2B f556a40a8ec9269b003e9e395cbb2541e863ee128fd91101254d305516a5091159b7f16d14a57b89e0efe82c5ab664ebc9ef22404aba53ef0bf05f1dacbfeab4 SHA512 64ff83bc1bfb130571ad56828a8dd6777dfd3189dedc7ac6a09ae2837c246e3a8cf17482d03431df817fdc779c198fa9645b53f71ee9ff847a5c6e19817eacbf +EBUILD kblog-18.08.3.ebuild 530 BLAKE2B a8b72dab312f634f34a9ff3ef5d1f40ce0943188389a58f543ae5a3ca740857becbf2a10874891d47c2223c3f5c44dc7c7d9061c2a86a216d6c15e1524b3b185 SHA512 85d737d8262e7d75958f60ab65508241bd67ac967156278777384acd4b21eccb2bdd9d1a566181977f46a3458febf47d3e5593c1a0854b3f6b29712451fcb74b +EBUILD kblog-18.12.0.ebuild 532 BLAKE2B c14b0879987b0071f2aff503ffb5ce2566247731b6b76ce083ffdadb12f70738c96a4cc063530d09683aa4924db60eee5e1d48a74dd06ca8e93b2ef601c65781 SHA512 c802b0956385989b0cc2a1ef93b2dfe9987f1e6d5de50fc3f828b49a476c7d80ce6c68356c5ab39ad7aa59e6218f134c8bcc3e2b349afa060ea7d26fe17b678b MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/kblog/files/kblog-18.04.3-syndication.patch b/kde-apps/kblog/files/kblog-18.04.3-syndication.patch deleted file mode 100644 index 4771666c0f02..000000000000 --- a/kde-apps/kblog/files/kblog-18.04.3-syndication.patch +++ /dev/null @@ -1,219 +0,0 @@ -From 85fc601b7c622a04c383331841733d681bfc50f3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org> -Date: Sun, 22 Apr 2018 15:37:01 +0200 -Subject: Fix build against Syndication - ---- - src/CMakeLists.txt | 1 + - src/feedretriever.cpp | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ - src/feedretriever.h | 54 ++++++++++++++++++++++++++++++++++++++++ - src/gdata.cpp | 11 +++++---- - 4 files changed, 129 insertions(+), 5 deletions(-) - create mode 100644 src/feedretriever.cpp - create mode 100644 src/feedretriever.h - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 03cef4e..1742abb 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -4,6 +4,7 @@ set(kblog_SRCS - blogcomment.cpp - blogmedia.cpp - blogger1.cpp -+ feedretriever.cpp - gdata.cpp - # livejournal.cpp - metaweblog.cpp -diff --git a/src/feedretriever.cpp b/src/feedretriever.cpp -new file mode 100644 -index 0000000..9d481c6 ---- /dev/null -+++ b/src/feedretriever.cpp -@@ -0,0 +1,68 @@ -+/* -+ This file is part of Akregator. -+ -+ Copyright (C) 2018 Daniel Vrátil <dvratil@kde.org> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ -+ As a special exception, permission is given to link this program -+ with any edition of Qt, and distribute the resulting executable, -+ without including the source code for Qt in the source distribution. -+*/ -+ -+#include "feedretriever.h" -+ -+#include <KIO/StoredTransferJob> -+ -+#include <QUrl> -+ -+using namespace KBlog; -+ -+FeedRetriever::FeedRetriever() -+ : Syndication::DataRetriever() -+{ -+} -+ -+void FeedRetriever::retrieveData(const QUrl &url) -+{ -+ auto job = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo); -+ connect(job, &KJob::result, this, &FeedRetriever::getFinished); -+ mJob = job; -+ mJob->start(); -+} -+ -+int FeedRetriever::errorCode() const -+{ -+ return mError; -+} -+ -+void FeedRetriever::abort() -+{ -+ if (mJob) { -+ mJob->kill(); -+ mJob = nullptr; -+ } -+} -+ -+void FeedRetriever::getFinished(KJob *job) -+{ -+ if (job->error()) { -+ mError = job->error(); -+ Q_EMIT dataRetrieved({}, false); -+ return; -+ } -+ -+ Q_EMIT dataRetrieved(static_cast<KIO::StoredTransferJob*>(job)->data(), true); -+} -diff --git a/src/feedretriever.h b/src/feedretriever.h -new file mode 100644 -index 0000000..fb28020 ---- /dev/null -+++ b/src/feedretriever.h -@@ -0,0 +1,54 @@ -+/* -+ This file is part of Akregator. -+ -+ Copyright (C) 2018 Daniel Vrátil <dvratil@kde.org> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+ -+ As a special exception, permission is given to link this program -+ with any edition of Qt, and distribute the resulting executable, -+ without including the source code for Qt in the source distribution. -+*/ -+ -+#ifndef FEEDRETRIEVER_H_ -+#define FEEDRETRIEVER_H_ -+ -+#include <syndication/dataretriever.h> -+ -+class KJob; -+ -+namespace KBlog { -+ -+class FeedRetriever : public Syndication::DataRetriever -+{ -+ Q_OBJECT -+public: -+ explicit FeedRetriever(); -+ -+ void retrieveData(const QUrl &url) override; -+ void abort() override; -+ int errorCode() const override; -+ -+private Q_SLOTS: -+ void getFinished(KJob *job); -+ -+private: -+ KJob *mJob = nullptr; -+ int mError = 0; -+}; -+ -+} -+ -+#endif -diff --git a/src/gdata.cpp b/src/gdata.cpp -index 9ca5b84..115e0a0 100644 ---- a/src/gdata.cpp -+++ b/src/gdata.cpp -@@ -23,6 +23,7 @@ - #include "gdata_p.h" - #include "blogpost.h" - #include "blogcomment.h" -+#include "feedretriever.h" - - #include <syndication/loader.h> - #include <syndication/item.h> -@@ -103,7 +104,7 @@ void GData::listBlogs() - SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)), - this, - SLOT(slotListBlogs(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode))); -- loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/blogs").arg(profileId()))); -+ loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/blogs").arg(profileId())), new FeedRetriever); - } - - void GData::listRecentPosts(const QStringList &labels, int number, -@@ -145,7 +146,7 @@ void GData::listRecentPosts(const QStringList &labels, int number, - SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)), - this, - SLOT(slotListRecentPosts(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode))); -- loader->loadFrom(url); -+ loader->loadFrom(url, new FeedRetriever); - } - - void GData::listRecentPosts(int number) -@@ -165,7 +166,7 @@ void GData::listComments(KBlog::BlogPost *post) - this, - SLOT(slotListComments(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode))); - loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/") + blogId() + QLatin1Char('/') + -- post->postId() + QStringLiteral("/comments/default"))); -+ post->postId() + QStringLiteral("/comments/default")), new FeedRetriever); - } - - void GData::listAllComments() -@@ -176,7 +177,7 @@ void GData::listAllComments() - SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)), - this, - SLOT(slotListAllComments(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode))); -- loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/comments/default").arg(blogId()))); -+ loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/comments/default").arg(blogId())), new FeedRetriever); - } - - void GData::fetchPost(KBlog::BlogPost *post) -@@ -196,7 +197,7 @@ void GData::fetchPost(KBlog::BlogPost *post) - SIGNAL(loadingComplete(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode)), - this, - SLOT(slotFetchPost(Syndication::Loader*,Syndication::FeedPtr,Syndication::ErrorCode))); -- loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/posts/default").arg(blogId()))); -+ loader->loadFrom(QUrl(QStringLiteral("http://www.blogger.com/feeds/%1/posts/default").arg(blogId())), new FeedRetriever); - } - - void GData::modifyPost(KBlog::BlogPost *post) --- -cgit v0.11.2 diff --git a/kde-apps/kblog/kblog-18.04.3.ebuild b/kde-apps/kblog/kblog-18.04.3.ebuild deleted file mode 100644 index 582ecc3b742a..000000000000 --- a/kde-apps/kblog/kblog-18.04.3.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_TEST="true" -inherit kde5 - -DESCRIPTION="Library providing client-side support for web application remote blogging APIs" -LICENSE="GPL-2+" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kxmlrpcclient) - $(add_kdeapps_dep kcalcore) - $(add_kdeapps_dep syndication) -" -RDEPEND="${DEPEND} - !kde-apps/kdepim-l10n -" diff --git a/kde-apps/kblog/kblog-18.08.3.ebuild b/kde-apps/kblog/kblog-18.08.3.ebuild index 205141fef707..4f1d4a3fa046 100644 --- a/kde-apps/kblog/kblog-18.08.3.ebuild +++ b/kde-apps/kblog/kblog-18.08.3.ebuild @@ -8,7 +8,7 @@ inherit kde5 DESCRIPTION="Library providing client-side support for web application remote blogging APIs" LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" DEPEND=" diff --git a/kde-apps/kblog/kblog-18.04.3-r1.ebuild b/kde-apps/kblog/kblog-18.12.0.ebuild index 9c93a45c0d09..205141fef707 100644 --- a/kde-apps/kblog/kblog-18.04.3-r1.ebuild +++ b/kde-apps/kblog/kblog-18.12.0.ebuild @@ -8,7 +8,7 @@ inherit kde5 DESCRIPTION="Library providing client-side support for web application remote blogging APIs" LICENSE="GPL-2+" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND=" @@ -22,5 +22,3 @@ DEPEND=" RDEPEND="${DEPEND} !kde-apps/kdepim-l10n " - -PATCHES=( "${FILESDIR}/${P}-syndication.patch" ) |