Control: tags 1067545 + patch
Control: tags 1067545 + pending
Dear maintainer,
I've prepared an NMU for klatexformula (versioned as 4.1.0-1.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru klatexformula-4.1.0/debian/changelog
klatexformula-4.1.0/debian/changelog
--- klatexformula-4.1.0/debian/changelog 2020-11-13 21:24:47.000000000
+0100
+++ klatexformula-4.1.0/debian/changelog 2024-05-27 08:46:23.000000000
+0200
@@ -1,3 +1,12 @@
+klatexformula (4.1.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport upstream commit 40d6fb87d7aff55a4c0e974aeff9fd1d918ad886 to
+ properly use time_t as type for time(); patch
+ upstream_Use-time_t-as-type-for-time.patch. (Closes: #1067545)
+
+ -- Pino Toscano <p...@debian.org> Mon, 27 May 2024 08:46:23 +0200
+
klatexformula (4.1.0-1) unstable; urgency=medium
* New upstream release.
diff -Nru klatexformula-4.1.0/debian/patches/series
klatexformula-4.1.0/debian/patches/series
--- klatexformula-4.1.0/debian/patches/series 2020-11-13 21:24:47.000000000
+0100
+++ klatexformula-4.1.0/debian/patches/series 2024-05-27 08:37:11.000000000
+0200
@@ -3,3 +3,4 @@
add_missing_QPainterPath_include
fix-unversioned-python-interpreter
fix-verson-in-python-interpreter-search
+upstream_Use-time_t-as-type-for-time.patch
diff -Nru
klatexformula-4.1.0/debian/patches/upstream_Use-time_t-as-type-for-time.patch
klatexformula-4.1.0/debian/patches/upstream_Use-time_t-as-type-for-time.patch
---
klatexformula-4.1.0/debian/patches/upstream_Use-time_t-as-type-for-time.patch
1970-01-01 01:00:00.000000000 +0100
+++
klatexformula-4.1.0/debian/patches/upstream_Use-time_t-as-type-for-time.patch
2024-05-27 08:34:43.000000000 +0200
@@ -0,0 +1,31 @@
+From 40d6fb87d7aff55a4c0e974aeff9fd1d918ad886 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.p...@tiscali.it>
+Date: Sat, 23 Mar 2024 10:28:40 +0100
+Subject: [PATCH] Use time_t as type for time()
+
+The return type of time() is time_t, so use it instead of long.
+
+While time_t is generally the same as long, in some cases it is not,
+e.g. on 32 bit architectures supporting 64 bit timestamps.
+---
+ src/main.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 7fee2d1..d77e64f 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -273,8 +273,8 @@ void signal_act(int sig)
+ fprintf(ftty, "Interrupt\n");
+ if (ftty != stderr) fprintf(stderr, "*** Interrupt\n");
+
+- static long last_sigint_time = 0;
+- long curtime;
++ static time_t last_sigint_time = 0;
++ time_t curtime;
+ time(&curtime);
+ bool isInsisted = (curtime - last_sigint_time <= 2); // re-pressed Ctrl-C
after less than 2 secs
+ if (!isInsisted && qApp != NULL) {
+--
+2.43.0
+
