[gentoo-commits] repo/gentoo:master commit in: kde-apps/akregator/files/
commit: 26d44ed1713e1e1e3d08c32419ba16ec9cbd5d7f
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Fri Feb 8 16:00:13 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 9 09:52:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d44ed1
kde-apps/akregator: remove unused patch
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/akregator-18.12.0-qt-5.11-crashfix.patch | 81 --
1 file changed, 81 deletions(-)
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
deleted file mode 100644
index f13512117a9..000
--- a/kde-apps/akregator/files/akregator-18.12.0-qt-5.11-crashfix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-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 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, ::destroyed, webEngineUrlInterceptor,
::deleteLater);
-+
- setPage(mPageEngine);
-
- connect(this, ::showContextMenu, this,
::slotShowContextMenu);
-@@ -494,3 +514,5 @@ void
ArticleViewerWebEngine::slotActivatePlugin(MessageViewer::ViewerPluginInter
- interface->setUrl(mCurrentUrl);
- interface->execute();
- }
-+
-+#include "articleviewerwebengine.moc"
---
-cgit v1.1
[gentoo-commits] repo/gentoo:master commit in: kde-apps/akregator/files/, kde-apps/akregator/
commit: d4bcc563209167d49ec009fa3ef29380cb3003cb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Feb 15 15:22:13 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Feb 15 15:43:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bcc563
kde-apps/akregator: Switch to upstream patch for same effect
Package-Manager: Portage-2.3.24, Repoman-2.3.6
kde-apps/akregator/akregator-17.12.2-r1.ebuild | 60 ++
...egator-17.12.2-slotSaveFeedList-not-twice.patch | 24 +
2 files changed, 84 insertions(+)
diff --git a/kde-apps/akregator/akregator-17.12.2-r1.ebuild
b/kde-apps/akregator/akregator-17.12.2-r1.ebuild
new file mode 100644
index 000..5a7d13827cb
--- /dev/null
+++ b/kde-apps/akregator/akregator-17.12.2-r1.ebuild
@@ -0,0 +1,60 @@
+# 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}/${P}-crashfix.patch"
+ "${FILESDIR}/${P}-slotSaveFeedList-not-twice.patch"
+)
diff --git
a/kde-apps/akregator/files/akregator-17.12.2-slotSaveFeedList-not-twice.patch
b/kde-apps/akregator/files/akregator-17.12.2-slotSaveFeedList-not-twice.patch
new file mode 100644
index 000..c504e90cb5d
--- /dev/null
+++
b/kde-apps/akregator/files/akregator-17.12.2-slotSaveFeedList-not-twice.patch
@@ -0,0 +1,24 @@
+From 6dcc0769f61e38580b70a5c29db0d9920f263c6e Mon Sep 17 00:00:00 2001
+From: Laurent Montel
+Date: Tue, 13 Feb 2018 07:28:44 +0100
+Subject: Don't call it twice
+
+---
+ src/akregator_part.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
+index 94a4e00..2073dce 100644
+--- a/src/akregator_part.cpp
b/src/akregator_part.cpp
+@@ -324,7 +324,6 @@ void Part::slotOnShutdown()
+ m_autosaveTimer->stop();
+ if (m_mainWidget) {
+ saveSettings();
+-slotSaveFeedList();
+ m_mainWidget->slotOnShutdown();
+ }
+ //delete m_mainWidget;
+--
+cgit v0.11.2
+
[gentoo-commits] repo/gentoo:master commit in: kde-apps/akregator/files/, kde-apps/akregator/
commit: 5174fc8a806c010723c285d5915c15281626a9af
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 11 22:14:17 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 11 22:14:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5174fc8a
kde-apps/akregator: Try to fix feedlist corruption and crashes
Bug: https://bugs.gentoo.org/629548
Package-Manager: Portage-2.3.24, Repoman-2.3.6
kde-apps/akregator/akregator-17.12.2.ebuild | 5 +
.../akregator/files/akregator-17.12.2-crashfix.patch| 16
.../files/akregator-17.12.2-feedlist-corruption.patch | 17 +
3 files changed, 38 insertions(+)
diff --git a/kde-apps/akregator/akregator-17.12.2.ebuild
b/kde-apps/akregator/akregator-17.12.2.ebuild
index 861bc0c9dc3..a9886e67a92 100644
--- a/kde-apps/akregator/akregator-17.12.2.ebuild
+++ b/kde-apps/akregator/akregator-17.12.2.ebuild
@@ -53,3 +53,8 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-l10n
"
+
+PATCHES=(
+ "${FILESDIR}/${P}-crashfix.patch"
+ "${FILESDIR}/${P}-feedlist-corruption.patch"
+)
diff --git a/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch
b/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch
new file mode 100644
index 000..c8c872f433b
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch
@@ -0,0 +1,16 @@
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index fd533ecd..2733b273 100644
+--- a/src/mainwindow.cpp
b/src/mainwindow.cpp
+@@ -137,9 +137,7 @@ MainWindow::~MainWindow()
+ void MainWindow::saveProperties(KConfigGroup )
+ {
+ if (!m_part) {
+-if (!loadPart()) {
+-return;
+-}
++return;
+ }
+
+ m_part->saveProperties(config);
+
diff --git
a/kde-apps/akregator/files/akregator-17.12.2-feedlist-corruption.patch
b/kde-apps/akregator/files/akregator-17.12.2-feedlist-corruption.patch
new file mode 100644
index 000..eefd844460a
--- /dev/null
+++ b/kde-apps/akregator/files/akregator-17.12.2-feedlist-corruption.patch
@@ -0,0 +1,17 @@
+diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
+index 94a4e00..3d2d778 100644
+--- a/src/akregator_part.cpp
b/src/akregator_part.cpp
+@@ -514,6 +514,11 @@ void Part::slotSaveFeedList()
+ if (!m_standardListLoaded) {
+ return;
+ }
++
++QSharedPointer f_list = m_mainWidget->allFeedsList();
++if (f_list.isNull()) {
++ return;
++}
+
+ // the first time we overwrite the feed list, we create a backup
+ if (!m_backedUpList) {
+
