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;
scm?id=3602ccfcd39dd87dc2dc4b90610d8447e86ec8db'>commit</a><a href='/guix/diff/gnu/packages/libreoffice.scm?id=3602ccfcd39dd87dc2dc4b90610d8447e86ec8db'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/libreoffice.scm'>
<input type='hidden' name='id' value='3602ccfcd39dd87dc2dc4b90610d8447e86ec8db'/><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=3602ccfcd39dd87dc2dc4b90610d8447e86ec8db'>root</a>/<a href='/guix/log/gnu?id=3602ccfcd39dd87dc2dc4b90610d8447e86ec8db'>gnu</a>/<a href='/guix/log/gnu/packages?id=3602ccfcd39dd87dc2dc4b90610d8447e86ec8db'>packages</a>/<a href='/guix/log/gnu/packages/libreoffice.scm?id=3602ccfcd39dd87dc2dc4b90610d8447e86ec8db'>libreoffice.scm</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/packages/libreoffice.scm?id=3602ccfcd39dd87dc2dc4b90610d8447e86ec8db&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-12-02 23:18:53 +0100'>2024-12-02</span></td><td><a href='/guix/commit/gnu/packages/libreoffice.scm?id=5914d906ba6f034d983e9f9167e84099bf3bcfcc'>gnu: libreoffice: Update to 24.8.3.2.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/libreoffice.scm (libreoffice): Update to 24.8.3.2.
[source]&lt;uri&gt;: Add secondary uri.
[arguments]&lt;#:phases&gt;: Fix build issue related to issue 43579 in phase
'prepare-src.
[configure-flags]: Add optimising flags --disable-cve-tests,
--enable-readonly-installset, --disable-dependency-tracking.
[native-inputs]: Add gcc-toolchain-12.
[inputs]: Add argon2, zxcvbn-c.

Change-Id: I72e0ebb4d075c47ea168b181f969a97f9249150a
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Nicolas Graves</td></tr>
<tr><td><span title='2024-08-31 10:45:43 +0200'>2024-08-31</span></td><td><a href='/guix/commit/gnu/packages/libreoffice.scm?id=fc91a71c779318f0e06884548f090f37d370a91b'>gnu: LibreOffice: Build with libxcrypt.</a><span class='msg-avail'>...<span class='msg-tooltip'>Glibc 2.38 no longer includes libcrypt by default, so we provide this
functionality via libxcrypt.

https://sourceware.org/glibc/wiki/Release/2.38#Building_libcrypt_is_disabled_by_default

* gnu/packages/libreoffice.scm (libreoffice)[inputs]: Add libxcrypt.

Change-Id: I3c9e02abb420a710d3a71bf137187dd989eb0398
</span></span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2024-06-13 10:52:22 +0200'>2024-06-13</span></td><td><a href='/guix/commit/gnu/packages/libreoffice.scm?id=dc5da408ec1b00d176c8cfa5021fc2b33a7a8e12'>gnu: libreoffice: Update to 7.6.7.2.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/libreoffice.scm (libreoffice): Update to 7.6.7.2.
* gnu/packages/hunspell.scm (hunspell-dict-he-il,
hunspell-dict-it-it): Update to 7.6.7.2.

Change-Id: I289a0b2b9648930b46102c055c642c333a4229fd
Co-authored-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Nicolas Graves</td></tr>