From 5174fc8a806c010723c285d5915c15281626a9af Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 11 Feb 2018 23:14:17 +0100
Subject: [PATCH] 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 +++++
 .../files/akregator-17.12.2-crashfix.patch      | 16 ++++++++++++++++
 .../akregator-17.12.2-feedlist-corruption.patch | 17 +++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 kde-apps/akregator/files/akregator-17.12.2-crashfix.patch
 create mode 100644 kde-apps/akregator/files/akregator-17.12.2-feedlist-corruption.patch

diff --git a/kde-apps/akregator/akregator-17.12.2.ebuild b/kde-apps/akregator/akregator-17.12.2.ebuild
index 861bc0c9dc32b..a9886e67a926c 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 0000000000000..c8c872f433bf5
--- /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 &config)
+ {
+     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 0000000000000..eefd844460a39
--- /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<FeedList> 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) {
+