diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
commit | 434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch) | |
tree | b72c523c72e764420f835ba9d63d43ffef687dcf /kde-apps/akregator/files | |
parent | f78108598211053d41752a83e0345441bb9014ae (diff) |
gentoo resync : 15.02.2018
Diffstat (limited to 'kde-apps/akregator/files')
3 files changed, 57 insertions, 0 deletions
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 000000000000..c8c872f433bf --- /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 000000000000..eefd844460a3 --- /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) { + 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 000000000000..c504e90cb5d9 --- /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 <montel@kde.org> +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 + |