gentoo resync : 20.03.2022

6 files changed, 156 insertions, 9 deletions

diff --git a/app-office/ktimetracker/Manifest b/app-office/ktimetracker/Manifest
index 121c1e746aa8..a55eb21dea0a 100644
--- a/app-office/ktimetracker/Manifest
+++ b/app-office/ktimetracker/Manifest
@@ -1,3 +1,7 @@
+AUX ktimetracker-5.0.1-fix-edit-history-dialog-crash.patch 1084 BLAKE2B d87540eb20e04e97cd5e87fef2c6835e8acdd764750671812cbd51ec5460f8c7f2ed95e480733e9e3a348b35e5ff8223bfa7348342f5f2d01f4a91036fbbac65 SHA512 3b29e0c213a7469a0d083d9f947941ed72bd6e83be63328d9232a7c43ddc9a027fcd31db18ae6302c72448c85eed6550dfe325f24d237154fb6902d4988cc607
+AUX ktimetracker-5.0.1-fix-formatTime-in-non-decimal-mode.patch 1278 BLAKE2B fde6c32461f978ba64f9b79136a40972ca502798c78a6e3d5e9b244af5f0791d8a75df771d59329b7993344f5fb49c100e47347f95ba0afb18eb79707feaabf6 SHA512 9cc60f8f01cc05ab575b6de4994d2f9ebce75153353f237cb05040dbc6826d6d044ae18abbe54bb13d486cba4e32ca94c86a035377700b79122609023cdd7575
+AUX ktimetracker-5.0.1-fix-sorting-of-time-columns.patch 1675 BLAKE2B 2b590c5db0e96c9fd7eff814c685d3047d0fe47deaceb68e26ff2d191745c5cd25cb97528a56163057036f0bf5669d775a8298a56fecfec75cc93de88e40cdbd SHA512 dd61a545da182f2b26be82ebadc11ab53ee40e37c1b4bfd07b2732d11ec72b187124d952f492d99690b64809c22f17ff932734041a9bd5464cbf879fc9fae0d2
+AUX ktimetracker-5.0.1-fix-table-column-visibility.patch 1084 BLAKE2B ea36953044d6efb9288b224ae93c2e5884f910f504bbbc8cc4ec6a45defce4a84e11789c17b33b34f7898bdf61077c07be56129580882544082d15b16e4d9017 SHA512 0a56fff5b94d3fa8a9d2be736ea3c23d6ae8f3efa6165c1e4cd4b9119316139cca58c0e4e861d1606bd73bea6f1993d9b22c11e7494c74aeb2148a28c63d7541
 DIST ktimetracker-5.0.1.tar.xz 422820 BLAKE2B 4aa4aba97f612b4ea426ed13cb0f830f646311254e75ab8ddef5f6edc62bbf2acb85d85d8031bae969f3dde411e649f645bb1fbd2a52b95eb831a530fa4e80ba SHA512 78de8651efd72fa9fd5c7f06992ab8970e1d763c6f30f5eba52ec93bb6a2bb19ae777bc90809ef5198bc3b6a5f9f5ee78e240eadcacd8ce8489bdb28cd62431e
-EBUILD ktimetracker-5.0.1.ebuild 1217 BLAKE2B 7b2061dfb6604b181c7b402aed93a515e687706a8ba8d726760a0aed088a458074d39499206acd0dee099633b9ab2ec7112bb371041d8eb56d1905028ea58a7c SHA512 95f380258f2bb9cda997acb592727b2e3d79642c305c1ce644eb0fd0994d64d303f5be7db2b9ec1218c980840fb7e5054127b5b58ec3dfb319a79ce730200f6f
+EBUILD ktimetracker-5.0.1-r1.ebuild 1511 BLAKE2B adf4bec1ee96b39b1cade6ebd04fae593c9e53657b4f9564079357043317f319c53571d4e3ca8040784e20cdd3d1f3e77630c11ec483b797922edebbb922a9d0 SHA512 b10acfcd93a064b043a54003d99475a5c5d503b07cee42ce11e48ea09b3294ce0293054eb9ab8abc9dbaa5c17d66ff5f6ba069f8c751db481d0e54a6f5b657c1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-edit-history-dialog-crash.patch b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-edit-history-dialog-crash.patch
new file mode 100644
index 000000000000..a27b7b6ae4d7
--- /dev/null
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-edit-history-dialog-crash.patch
@@ -0,0 +1,31 @@
+From 065d7c154641f83c46e490cbb5d15b6cff92121b Mon Sep 17 00:00:00 2001
+From: Marc Orcau <budalokko@gmail.com>
+Date: Tue, 27 Apr 2021 17:17:18 +0200
+Subject: [PATCH] Fix edit history dialog crash when event has non existent
+ related entity
+
+Replaced qFatal() by qCWarning(). Faulty event does not appear on the list then.
+
+BUG: 424993
+---
+ src/dialogs/historydialog.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/dialogs/historydialog.cpp b/src/dialogs/historydialog.cpp
+index ca2f10a..458c147 100644
+--- a/src/dialogs/historydialog.cpp
++++ b/src/dialogs/historydialog.cpp
+@@ -131,7 +131,9 @@ QString HistoryDialog::listAllEvents()
+ 
+         const Task *parent = dynamic_cast<Task*>(m_projectModel->tasksModel()->taskByUID(event->relatedTo()));
+         if (!parent) {
+-            qFatal("orphan event");
++            qCWarning(KTT_LOG) << "Unable to load 'relatedTo' entry for " << event->summary();
++            err = "NoRelatedToForEvent";
++            continue;
+         }
+ 
+         auto *item = new QTableWidgetItem(parent->name());
+-- 
+GitLab
+
diff --git a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-formatTime-in-non-decimal-mode.patch b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-formatTime-in-non-decimal-mode.patch
new file mode 100644
index 000000000000..ad5be92794a3
--- /dev/null
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-formatTime-in-non-decimal-mode.patch
@@ -0,0 +1,33 @@
+From 310c0fee25f142c6f6a0e7a0b4445af2e8785c79 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Wed, 21 Oct 2020 10:49:20 +0200
+Subject: [PATCH] Fix formatTime() in non-decimal mode on 32bit archs
+
+int64_t is not long int on 32bit architectures but long long int, thus
+the "%ld" printf modifer gets truncated/wrong values.
+
+As solution, do not use int64_t but long long int, so the "%lld" can be
+always used.
+---
+ src/ktimetrackerutility.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ktimetrackerutility.cpp b/src/ktimetrackerutility.cpp
+index aca00e8..fe449ba 100644
+--- a/src/ktimetrackerutility.cpp
++++ b/src/ktimetrackerutility.cpp
+@@ -33,9 +33,9 @@ QString formatTime(double minutes, bool decimal)
+         time.sprintf("%.2f", minutes / 60.0);
+         time.replace('.', QLocale().decimalPoint());
+     } else {
+-        const auto absMinutes = static_cast<int64_t>(std::round(std::fabs(minutes)));
++        const auto absMinutes = static_cast<long long int>(std::round(std::fabs(minutes)));
+         time.sprintf(
+-            "%s%ld:%02ld",
++            "%s%lld:%02lld",
+             minutes < 0 ? QString(QLocale().negativeSign()).toUtf8().data() : "",
+             absMinutes / 60, absMinutes % 60);
+     }
+-- 
+GitLab
+
diff --git a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-sorting-of-time-columns.patch b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-sorting-of-time-columns.patch
new file mode 100644
index 000000000000..f30ed30eaf6c
--- /dev/null
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-sorting-of-time-columns.patch
@@ -0,0 +1,38 @@
+From 7b17dccec643ffbf9e51a011d2aa1547169e9686 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@centrum.cz>
+Date: Sat, 8 May 2021 13:05:34 +0200
+Subject: [PATCH] fix sorting of time columns
+
+Commit 910b2939a07ee241 changed QVariant types for sorting from qlonglong
+to int64_t, but QSortFilterProxyModel::lessThan() docs explicitly list
+types that are compared numerically, int64_t is not one of them, so it
+gets sorted as a string. This meant that '0:02' was sorted before '0:17'.
+---
+ src/model/task.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/model/task.cpp b/src/model/task.cpp
+index 106e719..ff68b24 100644
+--- a/src/model/task.cpp
++++ b/src/model/task.cpp
+@@ -509,13 +509,13 @@ QVariant Task::data(int column, int role) const
+                 case 0:
+                     return m_name;
+                 case 1:
+-                    return QVariant::fromValue<int64_t>(m_sessionTime);
++                    return QVariant::fromValue<qlonglong>(m_sessionTime);
+                 case 2:
+-                    return QVariant::fromValue<int64_t>(m_time);
++                    return QVariant::fromValue<qlonglong>(m_time);
+                 case 3:
+-                    return QVariant::fromValue<int64_t>(m_totalSessionTime);
++                    return QVariant::fromValue<qlonglong>(m_totalSessionTime);
+                 case 4:
+-                    return QVariant::fromValue<int64_t>(m_totalTime);
++                    return QVariant::fromValue<qlonglong>(m_totalTime);
+                 case 5:
+                     return QVariant::fromValue<int>(m_priority);
+                 case 6:
+-- 
+GitLab
+
diff --git a/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-table-column-visibility.patch b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-table-column-visibility.patch
new file mode 100644
index 000000000000..13edc84a6114
--- /dev/null
+++ b/app-office/ktimetracker/files/ktimetracker-5.0.1-fix-table-column-visibility.patch
@@ -0,0 +1,34 @@
+From ddc87a47089b900ee1c62be10b23d0d4bb2361f1 Mon Sep 17 00:00:00 2001
+From: Alexander Potashev <aspotashev@gmail.com>
+Date: Mon, 24 Feb 2020 23:01:23 +0100
+Subject: [PATCH] TaskView: Change visibility of table columns after the view
+ is connected to model
+
+Otherwise setColumnHidden() has no effect.
+
+BUG: 417988
+---
+ src/taskview.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/taskview.cpp b/src/taskview.cpp
+index 3b9578f..c1b7580 100644
+--- a/src/taskview.cpp
++++ b/src/taskview.cpp
+@@ -164,12 +164,12 @@ void TaskView::load(const QUrl &url)
+     m_tasksWidget->setRootIsDecorated(true);
+ 
+     reconfigureModel();
+-    m_tasksWidget->reconfigure();
+ 
+     // Connect to the new model created by TimeTrackerStorage::load()
+     auto *tasksModel = m_storage->tasksModel();
+     m_filterProxyModel->setSourceModel(tasksModel);
+     m_tasksWidget->setSourceModel(tasksModel);
++    m_tasksWidget->reconfigure();
+     for (int i = 0; i <= tasksModel->columnCount(QModelIndex()); ++i) {
+         m_tasksWidget->resizeColumnToContents(i);
+     }
+-- 
+GitLab
+
diff --git a/app-office/ktimetracker/ktimetracker-5.0.1.ebuild b/app-office/ktimetracker/ktimetracker-5.0.1-r1.ebuild
index abcc9d1668ca..bfdec2373c77 100644
--- a/app-office/ktimetracker/ktimetracker-5.0.1.ebuild
+++ b/app-office/ktimetracker/ktimetracker-5.0.1-r1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.64.0
-QTMIN=5.12.3
+KDE_ORG_CATEGORY="pim"
+KFMIN=5.82.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Todo management and time tracker"
@@ -14,7 +16,7 @@ HOMEPAGE="https://userbase.kde.org/KTimeTracker"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
@@ -41,6 +43,11 @@ DEPEND="
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
-RDEPEND="${DEPEND}
-	!kde-apps/ktimetracker
-"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-table-column-visibility.patch" # KDE-bug 417988
+	"${FILESDIR}/${P}-fix-formatTime-in-non-decimal-mode.patch"
+	"${FILESDIR}/${P}-fix-edit-history-dialog-crash.patch" # KDE-bug 424993
+	"${FILESDIR}/${P}-fix-sorting-of-time-columns.patch"
+)