commit:     83abb136abb8fbf0d42ad217e722c7d1e31b0bf6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 20 21:37:50 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 20 21:39:39 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83abb136

kde-apps/eventviews: To-Do View: fix regression in filterAcceptsRow

See also: https://mail.kde.org/pipermail/release-team/2025-May/013672.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=473847

Upstream commit 976f0dead0a65f55aa9a419d7520bfa2fc40ce8a

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/eventviews/eventviews-25.04.1-r1.ebuild   | 46 ++++++++++++++++++++++
 .../files/eventviews-25.04.1-fix-todoview.patch    | 33 ++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/kde-apps/eventviews/eventviews-25.04.1-r1.ebuild 
b/kde-apps/eventviews/eventviews-25.04.1-r1.ebuild
new file mode 100644
index 000000000000..4512fcfa0878
--- /dev/null
+++ b/kde-apps/eventviews/eventviews-25.04.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=6.13.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="Calendar viewer for KDE PIM"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+DEPEND="
+       dev-libs/kdiagram:6
+       dev-libs/libical
+       >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+       >=kde-apps/akonadi-${PVCUT}:6
+       >=kde-apps/akonadi-calendar-${PVCUT}:6
+       >=kde-apps/calendarsupport-${PVCUT}:6
+       >=kde-apps/kcalutils-${PVCUT}:6
+       >=kde-apps/kmime-${PVCUT}:6
+       >=kde-apps/libkdepim-${PVCUT}:6
+       >=kde-frameworks/kcalendarcore-${KFMIN}:6
+       >=kde-frameworks/kcodecs-${KFMIN}:6
+       >=kde-frameworks/kcompletion-${KFMIN}:6
+       >=kde-frameworks/kconfig-${KFMIN}:6
+       >=kde-frameworks/kcontacts-${KFMIN}:6
+       >=kde-frameworks/kcoreaddons-${KFMIN}:6
+       >=kde-frameworks/kguiaddons-${KFMIN}:6
+       >=kde-frameworks/kholidays-${KFMIN}:6
+       >=kde-frameworks/ki18n-${KFMIN}:6
+       >=kde-frameworks/kiconthemes-${KFMIN}:6
+       >=kde-frameworks/kitemmodels-${KFMIN}:6
+       >=kde-frameworks/kservice-${KFMIN}:6
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-todoview.patch" ) # in 25.04.2, KDE-bug #473847

diff --git a/kde-apps/eventviews/files/eventviews-25.04.1-fix-todoview.patch 
b/kde-apps/eventviews/files/eventviews-25.04.1-fix-todoview.patch
new file mode 100644
index 000000000000..4b8e901712a7
--- /dev/null
+++ b/kde-apps/eventviews/files/eventviews-25.04.1-fix-todoview.patch
@@ -0,0 +1,33 @@
+From 976f0dead0a65f55aa9a419d7520bfa2fc40ce8a Mon Sep 17 00:00:00 2001
+From: Allen Winter <[email protected]>
+Date: Mon, 5 May 2025 08:32:40 -0400
+Subject: [PATCH] todoviewsortfilterproxymodel.cpp - fix regression in
+ filterAcceptsRow
+
+In filterAcceptsRow don't worry about invalid source_parent.
+Now todos are displayed again.
+
+BUG: 473847
+(cherry picked from commit 5c30c6614f3d862051fe51335e2631a7aded9d59)
+---
+ src/todo/todoviewsortfilterproxymodel.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/todo/todoviewsortfilterproxymodel.cpp 
b/src/todo/todoviewsortfilterproxymodel.cpp
+index 9bce7040..37b109d0 100644
+--- a/src/todo/todoviewsortfilterproxymodel.cpp
++++ b/src/todo/todoviewsortfilterproxymodel.cpp
+@@ -28,10 +28,6 @@ void TodoViewSortFilterProxyModel::sort(int column, 
Qt::SortOrder order)
+ 
+ bool TodoViewSortFilterProxyModel::filterAcceptsRow(int source_row, const 
QModelIndex &source_parent) const
+ {
+-    if (!source_parent.isValid()) {
+-        return false;
+-    }
+-
+     bool ret = QSortFilterProxyModel::filterAcceptsRow(source_row, 
source_parent);
+ 
+     if (ret && mCalFilter) {
+-- 
+GitLab
+

Reply via email to