File tree Expand file tree Collapse file tree 2 files changed +26
-0
lines changed Expand file tree Collapse file tree 2 files changed +26
-0
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ $(package)_patches += dont_use_avx_android_x86_64.patch dont_hardcode_x86_64.pat
13
13
$(package)_patches += fix_android_jni_static.patch dont_hardcode_pwd.patch
14
14
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
15
15
$(package)_patches += fix_bigsur_style.patch use_android_ndk23.patch
16
+ $(package)_patches += rcc_hardcode_timestamp.patch
16
17
17
18
$(package)_qttranslations_file_name =qttranslations-$($(package ) _suffix)
18
19
$(package)_qttranslations_sha256_hash =d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8
@@ -237,6 +238,7 @@ define $(package)_preprocess_cmds
237
238
patch -p1 -i $($(package ) _patch_dir) /fix_montery_include.patch && \
238
239
patch -p1 -i $($(package ) _patch_dir) /fix_bigsur_style.patch && \
239
240
patch -p1 -i $($(package ) _patch_dir) /use_android_ndk23.patch && \
241
+ patch -p1 -i $($(package ) _patch_dir) /rcc_hardcode_timestamp.patch && \
240
242
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
241
243
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
242
244
cp -f $($(package ) _patch_dir) /mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
Original file line number Diff line number Diff line change
1
+ Hardcode last modified timestamp in Qt RCC
2
+
3
+ This change allows the already built qt package to be reused even with
4
+ the SOURCE_DATE_EPOCH variable set, e.g., for Guix builds.
5
+
6
+
7
+ --- old/qtbase/src/tools/rcc/rcc.cpp
8
+ +++ new/qtbase/src/tools/rcc/rcc.cpp
9
+ @@ -227,14 +227,7 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib)
10
+
11
+ if (lib.formatVersion() >= 2) {
12
+ // last modified time stamp
13
+ - const QDateTime lastModified = m_fileInfo.lastModified();
14
+ - quint64 lastmod = quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0);
15
+ - static const quint64 sourceDate = 1000 * qgetenv("QT_RCC_SOURCE_DATE_OVERRIDE").toULongLong();
16
+ - if (sourceDate != 0)
17
+ - lastmod = sourceDate;
18
+ - static const quint64 sourceDate2 = 1000 * qgetenv("SOURCE_DATE_EPOCH").toULongLong();
19
+ - if (sourceDate2 != 0)
20
+ - lastmod = sourceDate2;
21
+ + quint64 lastmod = quint64(1);
22
+ lib.writeNumber8(lastmod);
23
+ if (text || pass1)
24
+ lib.writeChar('\n');
You can’t perform that action at this time.
0 commit comments