From 13094b78a790786030a468453c2b3ead4c7fd9cf Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Sun, 13 Nov 2022 14:01:21 +0100
Subject: [PATCH] Fix formatting of some larger file sizes on 32bit x86

With the x87 FPU available, GCC uses long double precision for some variables.
Due to the function call passing a double, some comparisons break down.
That resulted in "1.00 YB" being printed as "1000.00 ZB" instead.

Fixes #85
---
 templates/lib/util.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/templates/lib/util.cpp b/templates/lib/util.cpp
index 504674a7..a0381c59 100644
--- a/templates/lib/util.cpp
+++ b/templates/lib/util.cpp
@@ -23,6 +23,7 @@
 #include "metaenumvariable_p.h"
 #include "metatype.h"

+#include <cfloat>
 #include <QtCore/QStringList>

 QString Grantlee::unescapeStringLiteral(const QString &input)
@@ -212,7 +213,13 @@ std::pair<qreal, QString> Grantlee::calcFileSize(qreal size, int unitSystem,
   bool found = false;
   int count = 0;
   const qreal baseVal = (_unitSystem == 10) ? 1000.0F : 1024.0F;
+#if FLT_EVAL_METHOD == 2
+  // Avoid that this is treated as long double, as the increased
+  // precision breaks the comparison below.
+  volatile qreal current = 1.0F;
+#else
   qreal current = 1.0F;
+#endif
   int units = decimalUnits.size();
   while (!found && (count < units)) {
     current *= baseVal;
375630602f8bf972e4576b2b5d4f93949f0f1'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests'>
<input type='hidden' name='id' value='b36375630602f8bf972e4576b2b5d4f93949f0f1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=b36375630602f8bf972e4576b2b5d4f93949f0f1'>root</a>/<a href='/guix/log/gnu?id=b36375630602f8bf972e4576b2b5d4f93949f0f1'>gnu</a>/<a href='/guix/log/gnu/tests?id=b36375630602f8bf972e4576b2b5d4f93949f0f1'>tests</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/tests?id=b36375630602f8bf972e4576b2b5d4f93949f0f1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-12-12 20:23:32 +0100'>2022-12-12</span></td><td><a href='/guix/commit/gnu/tests?id=2c1b488d19831702288b8bdee4cecf661da91b60'>tests: Add system tests for each supported kernel version.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/base.scm (%test-basic-os): Rename to ...
(test-basic-os): ... this, and turn into procedure that takes optional KERNEL
argument.
(%test-basic-os): Use that procedure.
(%test-linux-libre-5.15, %test-linux-libre-5.10, %test-linux-libre-5.4,
%test-linux-libre-4.19, %test-linux-libre-4.14, %test-linux-libre-4.9): New
tests.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-12-12 15:03:35 +0100'>2022-12-12</span></td><td><a href='/guix/commit/gnu/tests?id=302a84a593e4be417d739caf4e5385df536e3943'>Merge branch 'version-1.4.0'</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-12-06 15:10:24 +0100'>2022-12-06</span></td><td><a href='/guix/commit/gnu/tests?id=6232959311b5717c19552e1116f6e4fea9797282'>tests: docker-system: Increase image size.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/docker.scm (run-docker-system-test)[vm]: Increase
'disk-image-size'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-12-06 10:24:59 +0100'>2022-12-06</span></td><td><a href='/guix/commit/gnu/tests?id=2493de0d1a481f079580a354430b26977afbdbd1'>Revert "tests: install: Fix iso-image-installer test."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit 0f66ef9aa99d2043abccbc80d858bdeca57534ac.  e2fsprogs is
now included in the installation operating system since
34f69bc6e6ea555929ecca83ee7592f5261ff5f2, making this workaround obsolete.

Suggested-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-12-05 11:21:18 -0500'>2022-12-05</span></td><td><a href='/guix/commit/gnu/tests?id=4016e01fdfe69694cd525c33c80bda53f8c5c4e5'>Revert "tests: install: Fix iso-image-installer test."</a><span class='msg-avail'>...<span class='msg-tooltip'>This reverts commit 0f66ef9aa99d2043abccbc80d858bdeca57534ac.  e2fsprogs is
now included in the installation operating system since
34f69bc6e6ea555929ecca83ee7592f5261ff5f2, making this workaround obsolete.

Suggested-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-12-04 23:12:36 +0100'>2022-12-04</span></td><td><a href='/guix/commit/gnu/tests?id=b2a848d23d37f31496e1ff664f1dcf6abcdcc388'>tests: Add gdm tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/gdm.scm: New file.
* gnu/local.mk: Register it.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Bruno Victal</td></tr>