commit: 5174fc8a806c010723c285d5915c15281626a9af Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 11 22:14:17 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 11 22:14:53 2018 +0000 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 00000000000..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 &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 00000000000..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<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) { +
