From 6b5506a28632b57c0c75c7cc66c0bc35d419b682 Mon Sep 17 00:00:00 2001 From: Fuzzbawls Date: Fri, 20 Jul 2018 23:21:50 -0700 Subject: Fix Qt's rcc determinism for depends/gitian Backport of https://bugreports.qt.io/browse/QTBUG-62511 to resolve locale determinism during the build process. --- depends/patches/qt/fix_rcc_determinism.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 depends/patches/qt/fix_rcc_determinism.patch (limited to 'depends/patches/qt/fix_rcc_determinism.patch') diff --git a/depends/patches/qt/fix_rcc_determinism.patch b/depends/patches/qt/fix_rcc_determinism.patch new file mode 100644 index 0000000000..c1b07fe23a --- /dev/null +++ b/depends/patches/qt/fix_rcc_determinism.patch @@ -0,0 +1,15 @@ +--- old/qtbase/src/tools/rcc/rcc.cpp ++++ new/qtbase/src/tools/rcc/rcc.cpp +@@ -207,7 +207,11 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib) + if (lib.formatVersion() >= 2) { + // last modified time stamp + const QDateTime lastModified = m_fileInfo.lastModified(); +- lib.writeNumber8(quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0)); ++ quint64 lastmod = quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0); ++ static const quint64 sourceDate = 1000 * qgetenv("QT_RCC_SOURCE_DATE_OVERRIDE").toULongLong(); ++ if (sourceDate != 0) ++ lastmod = sourceDate; ++ lib.writeNumber8(lastmod); + if (text || pass1) + lib.writeChar('\n'); + } -- cgit v1.2.3