Control: tags 1067830 + patch Dear maintainer,
I've prepared an NMU for gri (versioned as 2.12.27-1.2). The diff is attached to this message. Cheers -- Sebastian Ramacher
diff -Nru gri-2.12.27/debian/changelog gri-2.12.27/debian/changelog --- gri-2.12.27/debian/changelog 2022-08-25 18:33:47.000000000 +0200 +++ gri-2.12.27/debian/changelog 2024-04-11 23:23:28.000000000 +0200 @@ -1,3 +1,11 @@ +gri (2.12.27-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: Apply upstream patch to fix build with 64 bit time_t on + armel and armhf. (Closes: #1067830) + + -- Sebastian Ramacher <sramac...@debian.org> Thu, 11 Apr 2024 23:23:28 +0200 + gri (2.12.27-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru gri-2.12.27/debian/patches/fix-build-with-t64.patch gri-2.12.27/debian/patches/fix-build-with-t64.patch --- gri-2.12.27/debian/patches/fix-build-with-t64.patch 1970-01-01 01:00:00.000000000 +0100 +++ gri-2.12.27/debian/patches/fix-build-with-t64.patch 2024-04-11 23:22:33.000000000 +0200 @@ -0,0 +1,40 @@ +From 4d93a4e76543b914400d9e425e7c2de5c9dbb58d Mon Sep 17 00:00:00 2001 +From: dankelley <kelley....@gmail.com> +Date: Fri, 5 Apr 2024 07:10:17 -0300 +Subject: [PATCH] possibly fix debian error on time_t + +I am a bit concerned that this may break gri on other platforms, but not +really very concerned, since this fiddling with time types is likely +irrelevant to modern machines. And I doubt that anybody is building gri +on some of the platforms for which the code is making special cases. + +Please note that I do not have access to a machine that reproduces the +error message. I am on macos, and don't want to break my toolchain by +over-writing my C++ compilers, etc., to try to reproduce the bug. + +Lacking access to any type of linux machine, I am not able to test +whether my change fixes the problem. But the `git diff` is only one line +long, so hopefully if there is still a problem on debian, someone can +tell me a preprocesser symbol that I can use (and perhaps a header.h +file I can specify) to define the `time_t` type. + +Sorry for the hassles. + +Dan Kelley +--- + src/gr.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gr.hh b/src/gr.hh +index 6ff2f20..97b1756 100644 +--- a/src/gr.hh ++++ b/src/gr.hh +@@ -395,7 +395,7 @@ double lapse_rate(double S, double t, double p); + #if defined(__DECCXX) + #define SECOND_TYPE int + #else +-#define SECOND_TYPE long ++#define SECOND_TYPE time_t + #endif + #endif + diff -Nru gri-2.12.27/debian/patches/series gri-2.12.27/debian/patches/series --- gri-2.12.27/debian/patches/series 2022-08-25 18:33:47.000000000 +0200 +++ gri-2.12.27/debian/patches/series 2024-04-11 23:22:47.000000000 +0200 @@ -1 +1,2 @@ imagemagick.patch +fix-build-with-t64.patch
