[neon/extras/ktimetracker/Neon/stable] debian/patches: remove patch from branch

Jonathan Esk-Riddell null at kde.org
Fri Oct 21 14:32:34 BST 2022


Git commit 673a94938ca81fcd8691a69630b5967f00bc7dcc by Jonathan Esk-Riddell.
Committed on 21/10/2022 at 13:32.
Pushed by jriddell into branch 'Neon/stable'.

remove patch from branch

D  +0    -1    debian/patches/series
D  +0    -33   debian/patches/upstream_Fix-formatTime-in-non-decimal-mode-on-32bit-archs.patch

https://invent.kde.org/neon/extras/ktimetracker/commit/673a94938ca81fcd8691a69630b5967f00bc7dcc

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b2fb03e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_Fix-formatTime-in-non-decimal-mode-on-32bit-archs.patch
diff --git a/debian/patches/upstream_Fix-formatTime-in-non-decimal-mode-on-32bit-archs.patch b/debian/patches/upstream_Fix-formatTime-in-non-decimal-mode-on-32bit-archs.patch
deleted file mode 100644
index 27f80bf..0000000
--- a/debian/patches/upstream_Fix-formatTime-in-non-decimal-mode-on-32bit-archs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 310c0fee25f142c6f6a0e7a0b4445af2e8785c79 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at 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);
-     }
--- 
-2.28.0
-


More information about the Neon-commits mailing list