[gentoo-commits] repo/gentoo:master commit in: kde-apps/akregator/files/, kde-apps/akregator/

[Andreas Sturmlechner]

commit:     d4bcc563209167d49ec009fa3ef29380cb3003cb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 15 15:22:13 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 15:43:33 2018 +0000
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 00000000000..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 00000000000..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 <montel@×××.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
+