[gentoo-commits] repo/gentoo:master commit in: kde-apps/akregator/, kde-apps/akregator/files/
commit: b38e359348f8e7362532e19eb3e602348f9b5554 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 15 22:03:38 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 16 09:46:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b38e3593 kde-apps/akregator: Fix crash with Qt-5.11+ KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=371511 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/akregator/akregator-18.12.0-r1.ebuild | 57 +++ .../files/akregator-18.12.0-qt-5.11-crashfix.patch | 81 ++ 2 files changed, 138 insertions(+) diff --git a/kde-apps/akregator/akregator-18.12.0-r1.ebuild b/kde-apps/akregator/akregator-18.12.0-r1.ebuild new file mode 100644 index 000..d1132436997 --- /dev/null +++ b/kde-apps/akregator/akregator-18.12.0-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2018 Gentoo Authors +# 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_frameworks_dep syndication) + $(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_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}/${P}-qt-5.11-crashfix.patch" ) 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 000..f13512117a9 --- /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 +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 + #include + #include ++#include + + #include + #include +@@ -57,6 +58,19 @@ + + using namespace Akregator; + ++class AkregatorRequestInterceptor : public QWebEngineUrlRequestInterceptor ++{ ++Q_OBJECT ++ ++public: ++explicit AkregatorRequestInterceptor(QObject *parent = nullptr) : QWebEngineUrlRequestInterceptor(parent) { ++} ++ ++void interceptRequest(QWebEngineUrlRequestInfo ) 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
[gentoo-commits] repo/gentoo:master commit in: kde-apps/akregator/, kde-apps/akregator/files/
commit: 6d9d48a6e22660c15e07daf03c8319d2741f071a Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Oct 5 22:40:56 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Oct 5 22:42:04 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d9d48a6 kde-apps/akregator: Fix build with kde-frameworks/syndication Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.50, Repoman-2.3.11 kde-apps/akregator/akregator-18.04.3-r1.ebuild | 60 ++ .../files/akregator-18.04.3-syndication.patch | 222 + 2 files changed, 282 insertions(+) diff --git a/kde-apps/akregator/akregator-18.04.3-r1.ebuild b/kde-apps/akregator/akregator-18.04.3-r1.ebuild new file mode 100644 index 000..8f0cffe52ef --- /dev/null +++ b/kde-apps/akregator/akregator-18.04.3-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2018 Gentoo Authors +# 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_frameworks_dep syndication) + $(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_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" + "${FILESDIR}/${P}-syndication.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 new file mode 100644 index 000..f20f8fffa93 --- /dev/null +++ b/kde-apps/akregator/files/akregator-18.04.3-syndication.patch @@ -0,0 +1,222 @@ +From d2797fe48b6d4429cd30163fd75003118400511f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= +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, ::timeout, this, ::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()); +- +
[gentoo-commits] repo/gentoo:master commit in: kde-apps/akregator/, kde-apps/akregator/files/
commit: 306013b2e3da22f8e58270e0cff7eaa11fb32b1d Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 13 17:57:49 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 13 18:06:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=306013b2 kde-apps/akregator: Fix file corruption, crashes Package-Manager: Portage-2.3.8, Repoman-2.3.3 kde-apps/akregator/akregator-17.08.1-r1.ebuild | 58 ++ .../files/akregator-17.08.1-corruption.patch | 44 2 files changed, 102 insertions(+) diff --git a/kde-apps/akregator/akregator-17.08.1-r1.ebuild b/kde-apps/akregator/akregator-17.08.1-r1.ebuild new file mode 100644 index 000..de2fc23e16c --- /dev/null +++ b/kde-apps/akregator/akregator-17.08.1-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2017 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="" + +# drop qtwebengine subslot operator when QT_MINIMAL >= 5.8.0 +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 '' '' '5=') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) +" +DEPEND="${COMMON_DEPEND} + dev-libs/grantlee:5 +" +RDEPEND="${COMMON_DEPEND} + !kde-apps/kdepim-l10n +" + +PATCHES=( "${FILESDIR}/${P}-corruption.patch" ) diff --git a/kde-apps/akregator/files/akregator-17.08.1-corruption.patch b/kde-apps/akregator/files/akregator-17.08.1-corruption.patch new file mode 100644 index 000..f2e9d75a3c3 --- /dev/null +++ b/kde-apps/akregator/files/akregator-17.08.1-corruption.patch @@ -0,0 +1,44 @@ +From d0a5f4159cddcca656ca8bbcbd6e551e3499c166 Mon Sep 17 00:00:00 2001 +From: Anthony Fieroni+Date: Sun, 10 Sep 2017 21:59:35 +0300 +Subject: [akregator] Make sure part is created before main windows is restored + +DIfferential Revision: https://phabricator.kde.org/D6739 + +BUG: 381822 +BUG: 378513 +BUG: 381825 +BUG: 377129 + +Signed-off-by: Anthony Fieroni +--- + src/main.cpp | 13 + + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/src/main.cpp b/src/main.cpp +index b80b198..aa1bb08 100644 +--- a/src/main.cpp b/src/main.cpp +@@ -113,14 +113,11 @@ int main(int argc, char **argv) + + // see if we are starting with session management + if (app.isSessionRestored()) { +-#undef RESTORE +-#define RESTORE(type) { int n = 1; \ +-while (KMainWindow::canBeRestored(n)) { \ +-(new type)->restore(n, false); \ +-n++;} \ +-} +- +-RESTORE(Akregator::MainWindow); ++auto mainWindow = new Akregator::MainWindow(); ++mainWindow->loadPart(); ++if (KMainWindow::canBeRestored(1)) { ++mainWindow->restore(1, false); ++} + } + + return app.exec(); +-- +cgit v0.11.2 +