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;
nu/services?id=dec74d456365ae2d57213cbf0d0a9fd726600cbe'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services'>
<input type='hidden' name='id' value='dec74d456365ae2d57213cbf0d0a9fd726600cbe'/><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=dec74d456365ae2d57213cbf0d0a9fd726600cbe'>root</a>/<a href='/guix/log/gnu?id=dec74d456365ae2d57213cbf0d0a9fd726600cbe'>gnu</a>/<a href='/guix/log/gnu/services?id=dec74d456365ae2d57213cbf0d0a9fd726600cbe'>services</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/services?id=dec74d456365ae2d57213cbf0d0a9fd726600cbe&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-09-29 22:59:48 +0200'>2022-09-29</span></td><td><a href='/guix/commit/gnu/services?id=1bf18818c66fbdd329211e18c85ccd310fa74890'>services: certbot: Create "live" directory during activation.</a><span class='msg-avail'>...<span class='msg-tooltip'>When trying to run certbot, the mcron command fails, as
/etc/letsencrypt/live is missing.  This patch adds it into the certbot
activation service.

* gnu/services/certbot.scm (certbot-activation): Make /etc/letsencrypt/live.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Mája Tomášek</td></tr>
<tr><td><span title='2022-09-29 22:56:56 +0200'>2022-09-29</span></td><td><a href='/guix/commit/gnu/services?id=168a7933c0e138dc7061a3f0dc96871e16da5c5f'>services: shepherd: Leave the finalization thread in peace.</a><span class='msg-avail'>...<span class='msg-tooltip'>This gets rid of that (in)famous at boot time:

  error in finalization thread: Success

This was caused by the file-descriptor closing loop, which would clause
the finalization pipe, leading the finalization thread to (erroneously)
error out.

Thanks to Josselin Poiret for locating the problem!

* gnu/services/shepherd.scm (shepherd-boot-gexp): In 'loop', replace
'close-fdes' with a pair of 'fcntl' calls to add FD_CLOEXEC.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-09-28 19:45:38 -0400'>2022-09-28</span></td><td><a href='/guix/commit/gnu/services?id=45eac6cdf5c8d9d7b0c564b105c790d2d2007799'>services: Add file system utilities to profile.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/base.scm (file-system-type-&gt;utilities)
(file-system-utilities): New procedures.
(file-system-service-type): Extend 'profile-service-type' with
'file-system-utilities'.
* gnu/system.scm (boot-file-system-service): New procedure.
(operating-system-default-essential-services): Use it.
(%base-packages): Remove 'e2fsprogs'.

Signed-off-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
Modified-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
</span></span></td><td>Brice Waegeneire</td></tr>
<tr><td><span title='2022-09-28 09:57:30 -0400'>2022-09-28</span></td><td><a href='/guix/commit/gnu/services?id=2703b16005c83925335bfcf75300bb13ecb15c97'>services: samba: Remove unused variables and modules.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/samba.scm (%smb-conf): Delete unused variable.
</span></span></td><td>Maxim Cournoyer</td></tr>