diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /kde-apps/akregator | |
parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) |
gentoo resync : 24.12.2018
Diffstat (limited to 'kde-apps/akregator')
-rw-r--r-- | kde-apps/akregator/Manifest | 9 | ||||
-rw-r--r-- | kde-apps/akregator/akregator-18.04.3.ebuild | 57 | ||||
-rw-r--r-- | kde-apps/akregator/akregator-18.08.3.ebuild | 2 | ||||
-rw-r--r-- | kde-apps/akregator/akregator-18.12.0-r1.ebuild (renamed from kde-apps/akregator/akregator-18.04.3-r1.ebuild) | 7 | ||||
-rw-r--r-- | kde-apps/akregator/files/akregator-18.04.3-syndication.patch | 222 | ||||
-rw-r--r-- | kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch | 81 |
6 files changed, 88 insertions, 290 deletions
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest index e7f2cc8dd1c1..358ba71ec62e 100644 --- a/kde-apps/akregator/Manifest +++ b/kde-apps/akregator/Manifest @@ -1,8 +1,7 @@ AUX akregator-17.12.2-crashfix.patch 383 BLAKE2B c50546f9897bdccf1bddc00e51d6068282fa4eb04a9ea81f8ef8f566158a013c01ff3607504af2a6bcd1f026415fe8f6274b2268b608caf0a48c8d98b51833ea SHA512 df344cde73e4dd1813214bc3dcd4624661bdd53f2174d8dffb5fd222c10133d83f678f0cac68c84dea21dc09888a8f120cd23b3c6d1f34e320b5af51fa0e3dd1 -AUX akregator-18.04.3-syndication.patch 7231 BLAKE2B 1d204766d0d15653fd56db22ca5400537819521dde933f0dd06db3a430b1943e8b8bd94ba8beb5df9b91a0c548ffc1d39431ce639ed707983446b9eeb4a1d2e6 SHA512 d084138db86daf60116252d57fdfc5988fb18f1bc6a75b7898ff73c6c4164e084806c879ce04513293b1c48644a47b74b3a69e867ce7854777e9b9e24cb21fc0 -DIST akregator-18.04.3.tar.xz 2251168 BLAKE2B 9c57a3e125e5bf191df4fc60b9eacb471942735f5f2890a74f8812a97bbaacdbbf537b070d58f73ca054dee6eb42a575168c3061717c0809e79316b74f80fc2d SHA512 d9f1385c1105be62a7c209510e66b8152ddf3928a55210bff82c679602ef630486f9b7cbbc36d4d28183b7f7667049a5b474d953af38aed0bbbe3c7b00732930 +AUX akregator-18.12.0-qt-5.11-crashfix.patch 2918 BLAKE2B c2fac1204d75b46cd4eeda1cbce77c3f167fb06ce0406817ba5c41a173c5d1fd0440755a51903793598c1324b00951f139ffcf8b37dc5edf8fed37de97fa93d9 SHA512 135b67de7c97aa31537553aea2c90aafb02d48427c784e74de1d01513c4e584e94f26923b9950f4bb537fa3468904978f7e334a5a9375d314abdaa5e0239d932 DIST akregator-18.08.3.tar.xz 2254188 BLAKE2B 42215f5d43490d6cf95808d970ee66d14acdd29b62fb8c575587741ffbaf970b18f1bc67937385d469e39da78a86a1d22b8adb383d7ccb509873d5b0b61b969b SHA512 1033356de9ad97892efe875dd79501d9588f06b24c1ebf86e235851b522878bf46b93dfe02c9d5c08fbd4934bbe65dec9bc20201826fdcc3ed9e1f9b3ea4cdd4 -EBUILD akregator-18.04.3-r1.ebuild 1533 BLAKE2B fc9286fedfa6300d282276eefd037ecccfd75ed806bfabf45af3198886b0928056533b78f88129139089f24390aca448b13eb0e7756b98fe42ae13c35d0dde9c SHA512 9d3fb0f17debaace9481022773da58c672a45ffa525e74679466836c7a2bbeff36944960bfad2c2dde9df9b5cb75054f28fcf7a1720a0352a9efef76383875a5 -EBUILD akregator-18.04.3.ebuild 1494 BLAKE2B f61953255f5a9da53b9f4f98f24ec9b9b8150f2248c00223c4edc332fb81b326583c686dc057b2badaa131c78adb04a89b511e7caa210484f1c6cb3596569dc0 SHA512 46e4bcb6178e734884715c85d4369dbfdfee7076a520a995c53d06ad89328b0315d12e81474b61dbcde6b1a7c0a163ef700f0593002999b710c9f1e80c21e3c7 -EBUILD akregator-18.08.3.ebuild 1496 BLAKE2B 2aa275f4140b341c7254464cddf083c7a1a8c43ccf2b4c51e6fbc1f510357438065dc4de06accf02611597628567cbc30db4eac97f0a0aaed230ff6abfce74f8 SHA512 37ae3daa459fd264cd157ba6ca97cdb322fda3944c650e4ecdd1fb6d1ca68011fd836175cecb8946699419d24aafb33009a1576ec4c07059900fb3cc65f812b0 +DIST akregator-18.12.0.tar.xz 2189036 BLAKE2B 2b48bce3cc65a0d9a34697f982906cd91a1cb4320a8669dc6453531490de90bae642f4c4bb882b84cdafbdfb0ef2d03e52207e777213ef75153913ed91a085d8 SHA512 b94b7893a5e741848179b7048b21080512be3d7ea0342e870ca413e7f8313a3687e97afda5b20f36ef5ae0ea332fadec294139d9dfd8030dd230b9f0efdaafe2 +EBUILD akregator-18.08.3.ebuild 1494 BLAKE2B bcf2cbd9ad2f7814d17293f44e8e2d6de049844a2360178e46bbd6d861913b163915e574caa6059ddcff29ae81e87fcf127c8fa68f39f7a1c1885d07d74c08f1 SHA512 c37f3316b460efb72a1ba1135c5aea30b4d36beb4d3431e2315ee4e66e908aa5d482b075089abc010e330a847c1d69959acf1d76c64a6a2a4d617bf2fb302b6c +EBUILD akregator-18.12.0-r1.ebuild 1495 BLAKE2B a4f407b36370d95d33407d894a240c2fa1254e67d20fc1d4128d3c53557088eb623bbeab27e7fd5aecb53719193ddd6296aa1334041eb1c2afe05be1bf58879a SHA512 ddaabdc813be7e4aacc99be8f30ea621730edb65923a5144f0a9c4876f8688fb8006f21c5c126bb2825903645aff0133a440b600aaf869ed319f884ce487607c MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/akregator/akregator-18.04.3.ebuild b/kde-apps/akregator/akregator-18.04.3.ebuild deleted file mode 100644 index 85f0ff3093b8..000000000000 --- a/kde-apps/akregator/akregator-18.04.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -inherit kde5 - -DESCRIPTION="News feed aggregator" -HOMEPAGE="https://www.kde.org/applications/internet/akregator" -LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" -KEYWORDS="amd64 x86" - -IUSE="" - -COMMON_DEPEND=" - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_kdeapps_dep grantleetheme) - $(add_kdeapps_dep kontactinterface) - $(add_kdeapps_dep kpimtextedit) - $(add_kdeapps_dep libkdepim) - $(add_kdeapps_dep messagelib) - $(add_kdeapps_dep pimcommon) - $(add_kdeapps_dep syndication) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwebengine) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) -" -DEPEND="${COMMON_DEPEND} - dev-libs/grantlee:5 -" -RDEPEND="${COMMON_DEPEND} - !kde-apps/kdepim-l10n -" - -PATCHES=( "${FILESDIR}/${PN}-17.12.2-crashfix.patch" ) diff --git a/kde-apps/akregator/akregator-18.08.3.ebuild b/kde-apps/akregator/akregator-18.08.3.ebuild index 2f189164e53f..a4fcaa200bfd 100644 --- a/kde-apps/akregator/akregator-18.08.3.ebuild +++ b/kde-apps/akregator/akregator-18.08.3.ebuild @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="News feed aggregator" HOMEPAGE="https://www.kde.org/applications/internet/akregator" LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" diff --git a/kde-apps/akregator/akregator-18.04.3-r1.ebuild b/kde-apps/akregator/akregator-18.12.0-r1.ebuild index 0458b89e5525..d1132436997b 100644 --- a/kde-apps/akregator/akregator-18.04.3-r1.ebuild +++ b/kde-apps/akregator/akregator-18.12.0-r1.ebuild @@ -10,7 +10,7 @@ inherit kde5 DESCRIPTION="News feed aggregator" HOMEPAGE="https://www.kde.org/applications/internet/akregator" LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" @@ -54,7 +54,4 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kdepim-l10n " -PATCHES=( - "${FILESDIR}/${PN}-17.12.2-crashfix.patch" - "${FILESDIR}/${P}-syndication.patch" -) +PATCHES=( "${FILESDIR}/${P}-qt-5.11-crashfix.patch" ) diff --git a/kde-apps/akregator/files/akregator-18.04.3-syndication.patch b/kde-apps/akregator/files/akregator-18.04.3-syndication.patch deleted file mode 100644 index f20f8fffa93e..000000000000 --- a/kde-apps/akregator/files/akregator-18.04.3-syndication.patch +++ /dev/null @@ -1,222 +0,0 @@ -From d2797fe48b6d4429cd30163fd75003118400511f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org> -Date: Sun, 22 Apr 2018 09:13:45 +0200 -Subject: Port away from remove Syndication API - ---- - src/CMakeLists.txt | 1 + - src/akregator_part.cpp | 10 ------ - src/feed/feed.cpp | 3 +- - src/feed/feedretriever.cpp | 78 ++++++++++++++++++++++++++++++++++++++++++++++ - src/feed/feedretriever.h | 54 ++++++++++++++++++++++++++++++++ - 5 files changed, 135 insertions(+), 11 deletions(-) - create mode 100644 src/feed/feedretriever.cpp - create mode 100644 src/feed/feedretriever.h - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 86af10e..312daee 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -86,6 +86,7 @@ set(akregatorprivate_LIB_SRCS - article.cpp - feed/feed.cpp - feed/feedlist.cpp -+ feed/feedretriever.cpp - treenode.cpp - treenodevisitor.cpp - utils.cpp -diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp -index 74acfab..afde53f 100644 ---- a/src/akregator_part.cpp -+++ b/src/akregator_part.cpp -@@ -259,14 +259,6 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList &) - connect(m_autosaveTimer, &QTimer::timeout, this, &Part::slotSaveFeedList); - m_autosaveTimer->start(5 * 60 * 1000); // 5 minutes - -- QString useragent = QStringLiteral("Akregator/%1; syndication").arg(QStringLiteral(AKREGATOR_VERSION)); -- -- if (!Settings::customUserAgent().isEmpty()) { -- useragent = Settings::customUserAgent(); -- } -- -- Syndication::FileRetriever::setUserAgent(useragent); -- - loadPlugins(QStringLiteral("extension")); // FIXME: also unload them! - if (mCentralWidget->previousSessionCrashed()) { - mCentralWidget->needToRestoreCrashedSession(); -@@ -361,8 +353,6 @@ void Part::slotSettingsChanged() - m_actionManager->setTrayIcon(nullptr); - } - -- Syndication::FileRetriever::setUseCache(Settings::useHTMLCache()); -- - const QStringList fonts { - Settings::standardFont(), - Settings::fixedFont(), -diff --git a/src/feed/feed.cpp b/src/feed/feed.cpp -index 87ba473..774f506 100644 ---- a/src/feed/feed.cpp -+++ b/src/feed/feed.cpp -@@ -36,6 +36,7 @@ - #include "treenodevisitor.h" - #include "types.h" - #include "utils.h" -+#include "feedretriever.h" - - #include <Syndication/Syndication> - -@@ -681,7 +682,7 @@ void Akregator::Feed::tryFetch() - d->loader = Syndication::Loader::create(this, SLOT(fetchCompleted(Syndication::Loader *, - Syndication::FeedPtr, - Syndication::ErrorCode))); -- d->loader->loadFrom(QUrl(d->xmlUrl)); -+ d->loader->loadFrom(QUrl(d->xmlUrl), new FeedRetriever()); - } - - void Akregator::Feed::slotImageFetched(const QPixmap &image) -diff --git a/src/feed/feedretriever.cpp b/src/feed/feedretriever.cpp -new file mode 100644 -index 0000000..62526c4 ---- /dev/null -+++ b/src/feed/feedretriever.cpp -@@ -0,0 +1,78 @@ -+/* -+ 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 "akregatorconfig.h" -+#include "akregator-version.h" -+ -+#include <KIO/StoredTransferJob> -+ -+#include <QUrl> -+ -+using namespace Akregator; -+ -+FeedRetriever::FeedRetriever() -+ : Syndication::DataRetriever() -+{ -+} -+ -+void FeedRetriever::retrieveData(const QUrl &url) -+{ -+ QString userAgent = QStringLiteral("Akregator/%1; syndication").arg(QStringLiteral(AKREGATOR_VERSION)); -+ if (!Settings::customUserAgent().isEmpty()) { -+ userAgent = Settings::customUserAgent(); -+ } -+ bool useCache = Settings::useHTMLCache(); -+ -+ auto job = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo); -+ job->addMetaData(QStringLiteral("UserAgent"), userAgent); -+ job->addMetaData(QStringLiteral("cache"), useCache ? QStringLiteral("refresh") : QStringLiteral("reload")); -+ 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/feed/feedretriever.h b/src/feed/feedretriever.h -new file mode 100644 -index 0000000..3a0ff3d ---- /dev/null -+++ b/src/feed/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 Akregator { -+ -+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 --- -cgit v0.11.2 diff --git a/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch b/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch new file mode 100644 index 000000000000..f13512117a90 --- /dev/null +++ b/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch @@ -0,0 +1,81 @@ +From 91a4ab57a82970bd75eee4a7aee61a7e1c1321ef Mon Sep 17 00:00:00 2001 +From: Andras Mantia <andras@kdab.com> +Date: Thu, 13 Dec 2018 17:32:52 +0200 +Subject: Don't crash with Qt 5.11+ + +Summary: +Based on the patch from https://bugs.kde.org/show_bug.cgi?id=371511 +See also https://bugreports.qt.io/browse/QTBUG-72260 + +BUG: 371511 + +Reviewers: PHID-PROJ-odxxyyfgujhgbu6ergrt, mlaurent + +Reviewed By: PHID-PROJ-odxxyyfgujhgbu6ergrt, mlaurent + +Subscribers: marten, asturmlechner, kfunk, kde-pim + +Tags: #kde_pim + +Differential Revision: https://phabricator.kde.org/D17563 +--- + .../webengine/articleviewerwebengine.cpp | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp +index 2463fdf..174c09a 100644 +--- a/src/articleviewer-ng/webengine/articleviewerwebengine.cpp ++++ b/src/articleviewer-ng/webengine/articleviewerwebengine.cpp +@@ -46,6 +46,7 @@ + #include <QMenu> + #include <viewerplugintoolmanager.h> + #include <QWebEngineProfile> ++#include <QWebEngineUrlRequestInterceptor> + + #include <WebEngineViewer/WebHitTestResult> + #include <WebEngineViewer/WebHitTest> +@@ -57,6 +58,19 @@ + + using namespace Akregator; + ++class AkregatorRequestInterceptor : public QWebEngineUrlRequestInterceptor ++{ ++ Q_OBJECT ++ ++public: ++ explicit AkregatorRequestInterceptor(QObject *parent = nullptr) : QWebEngineUrlRequestInterceptor(parent) { ++ } ++ ++ void interceptRequest(QWebEngineUrlRequestInfo &info) override { ++ Q_UNUSED(info); ++ } ++}; ++ + ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *parent) + : WebEngineViewer::WebEngineView(parent) + , mActionCollection(ac) +@@ -64,10 +78,16 @@ ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *p + , mViewerPluginToolManager(nullptr) + { + mNetworkAccessManager = new WebEngineViewer::InterceptorManager(this, ac, this); ++ + QWebEngineProfile *profile = QWebEngineProfile::defaultProfile(); + mPageEngine = new ArticleViewerWebEnginePage(profile, this); + profile->setPersistentCookiesPolicy(QWebEngineProfile::ForcePersistentCookies); + ++ // Needed to workaround crash in webengine, see https://bugreports.qt.io/browse/QTBUG-72260 ++ auto webEngineUrlInterceptor = new AkregatorRequestInterceptor(); ++ profile->setRequestInterceptor(webEngineUrlInterceptor); ++ connect(profile, &QObject::destroyed, webEngineUrlInterceptor, &AkregatorRequestInterceptor::deleteLater); ++ + setPage(mPageEngine); + + connect(this, &ArticleViewerWebEngine::showContextMenu, this, &ArticleViewerWebEngine::slotShowContextMenu); +@@ -494,3 +514,5 @@ void ArticleViewerWebEngine::slotActivatePlugin(MessageViewer::ViewerPluginInter + interface->setUrl(mCurrentUrl); + interface->execute(); + } ++ ++#include "articleviewerwebengine.moc" +-- +cgit v1.1 |