From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- kde-apps/kblog/Manifest | 2 + .../kblog/files/kblog-18.04.3-syndication.patch | 219 +++++++++++++++++++++ kde-apps/kblog/kblog-18.04.3-r1.ebuild | 26 +++ 3 files changed, 247 insertions(+) create mode 100644 kde-apps/kblog/files/kblog-18.04.3-syndication.patch create mode 100644 kde-apps/kblog/kblog-18.04.3-r1.ebuild (limited to 'kde-apps/kblog') diff --git a/kde-apps/kblog/Manifest b/kde-apps/kblog/Manifest index f5a36eb4b704..ce0119a149df 100644 --- a/kde-apps/kblog/Manifest +++ b/kde-apps/kblog/Manifest @@ -1,5 +1,7 @@ +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.1.tar.xz 73056 BLAKE2B d49c4f3a943610d42469eea2ed05d4d8557e5dc7ebb31985d1477dcd150ef95361240759e7998e1a1c18ff34b71d8a1a8d88d4a2dd3628315863211417bb2ab5 SHA512 ff05e23f5a9cedfccc3fbe611471b5261e49ad71b0a194951bb48091667a0290337d8a209d29e9f8780be58a01cd1690de3b619a04f581ac5ebf3e68a22199f6 +EBUILD kblog-18.04.3-r1.ebuild 582 BLAKE2B 8efc7838ddb4619f778da6124b82593a54fcf69a41d0554479841c09c69072a71a621f330335cb1d38419c50ba663260963c079b40cc4d0761a882a34b0051dc SHA512 941ba72dc431a9a878026d65c6cbad2631f8d38c3e90524761763bf70e17f71fb17a0339d1e73220f169e846aa0615a37f0929a26dd6b94f6569af17ec7ed910 EBUILD kblog-18.04.3.ebuild 530 BLAKE2B 2a664bdebe9aed7515df9eb4535c850245632b331a23548c82421b96b592f4ece00334320e731e99ad7bb32e1d44f68e85770efe21805f4525f8989ec197a602 SHA512 cf8f8b2331184ddfd495519c39f2091e87c249c4662a1a0ec1d07bd00ec72b213f6e059821d6f9958545489fdd05764731a9d5aadfd12ed830ec1e2e8f7d3bf4 EBUILD kblog-18.08.1.ebuild 535 BLAKE2B 79b2ba3af7a09595f9b4a6547f24390d6af2bd17c7d79ea1dfd2d22b52b031c3bc4f98eb92fca826b7bbf9fbf54418c4ea31ebe8e0d843a570e7db01dc5aba06 SHA512 8ff909c9ca6601742874de8654ad85d03137ac5f97d8eb504ac36f7b8451622e34afdaeb176a7c0315eb052f89fb3aeb58a1f497a98af4c5074f5cebe4c67fc1 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 new file mode 100644 index 000000000000..4771666c0f02 --- /dev/null +++ b/kde-apps/kblog/files/kblog-18.04.3-syndication.patch @@ -0,0 +1,219 @@ +From 85fc601b7c622a04c383331841733d681bfc50f3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= +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 ++ ++ 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 ++ ++#include ++ ++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(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 ++ ++ 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 ++ ++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 + #include +@@ -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-r1.ebuild b/kde-apps/kblog/kblog-18.04.3-r1.ebuild new file mode 100644 index 000000000000..1deda67b9ff6 --- /dev/null +++ b/kde-apps/kblog/kblog-18.04.3-r1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2018 Gentoo Authors +# 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_frameworks_dep syndication) + $(add_kdeapps_dep kcalcore) +" +RDEPEND="${DEPEND} + !kde-apps/kdepim-l10n +" + +PATCHES=( "${FILESDIR}/${P}-syndication.patch" ) -- cgit v1.2.3