Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/akregator/, kde-apps/akregator/files/
Date: Thu, 15 Feb 2018 15:33:05
Message-Id: 1518708718.8122fa968fff3a1a9cbd47d589cef16226103b05.asturm@gentoo
1 commit: 8122fa968fff3a1a9cbd47d589cef16226103b05
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 15 15:22:13 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 15 15:31:58 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8122fa96
7
8 kde-apps/akregator: Try to fix crashes w/ global menu
9
10 Bug: https://bugs.gentoo.org/629548
11 Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13 kde-apps/akregator/akregator-17.12.49.9999.ebuild | 2 ++
14 kde-apps/akregator/akregator-9999.ebuild | 2 ++
15 .../akregator/files/akregator-17.12.2-crashfix.patch | 16 ++++++++++++++++
16 3 files changed, 20 insertions(+)
17
18 diff --git a/kde-apps/akregator/akregator-17.12.49.9999.ebuild b/kde-apps/akregator/akregator-17.12.49.9999.ebuild
19 index 8b9416daee..3db4e0f68b 100644
20 --- a/kde-apps/akregator/akregator-17.12.49.9999.ebuild
21 +++ b/kde-apps/akregator/akregator-17.12.49.9999.ebuild
22 @@ -53,3 +53,5 @@ DEPEND="${COMMON_DEPEND}
23 RDEPEND="${COMMON_DEPEND}
24 !kde-apps/kdepim-l10n
25 "
26 +
27 +PATCHES=( "${FILESDIR}/${PN}-17.12.2-crashfix.patch" )
28
29 diff --git a/kde-apps/akregator/akregator-9999.ebuild b/kde-apps/akregator/akregator-9999.ebuild
30 index 8b9416daee..3db4e0f68b 100644
31 --- a/kde-apps/akregator/akregator-9999.ebuild
32 +++ b/kde-apps/akregator/akregator-9999.ebuild
33 @@ -53,3 +53,5 @@ DEPEND="${COMMON_DEPEND}
34 RDEPEND="${COMMON_DEPEND}
35 !kde-apps/kdepim-l10n
36 "
37 +
38 +PATCHES=( "${FILESDIR}/${PN}-17.12.2-crashfix.patch" )
39
40 diff --git a/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch b/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch
41 new file mode 100644
42 index 0000000000..c8c872f433
43 --- /dev/null
44 +++ b/kde-apps/akregator/files/akregator-17.12.2-crashfix.patch
45 @@ -0,0 +1,16 @@
46 +diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
47 +index fd533ecd..2733b273 100644
48 +--- a/src/mainwindow.cpp
49 ++++ b/src/mainwindow.cpp
50 +@@ -137,9 +137,7 @@ MainWindow::~MainWindow()
51 + void MainWindow::saveProperties(KConfigGroup &config)
52 + {
53 + if (!m_part) {
54 +- if (!loadPart()) {
55 +- return;
56 +- }
57 ++ return;
58 + }
59 +
60 + m_part->saveProperties(config);
61 +