Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2019-01-15 13:13:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Tue Jan 15 13:13:30 2019 rev:92 rq:663360 version:5.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2018-12-27 00:22:31.475999534 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.28833/libqt5-qtbase.changes 2019-01-15 13:13:32.036491417 +0100 @@ -1,0 +2,7 @@ +Mon Jan 7 13:56:29 UTC 2019 - bwiedem...@suse.com + +- Add reproducible-qrc-time.patch to use SOURCE_DATE_EPOCH + for qrc embedded timestamps to make bitcoin-qt build reproducible + (https://bugreports.qt.io/browse/QTBUG-62511, boo#1047218) + +------------------------------------------------------------------- @@ -8,0 +16,6 @@ + +------------------------------------------------------------------- +Wed Dec 19 19:54:05 UTC 2018 - Todd R <toddrme2...@gmail.com> + +- Use upstream-recommended %{_rpmconfigdir}/macros.d directory + for the rpm macros. New: ---- reproducible-qrc-time.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.PqEw9G/_old 2019-01-15 13:13:34.328489627 +0100 +++ /var/tmp/diff_new_pack.PqEw9G/_new 2019-01-15 13:13:34.328489627 +0100 @@ -73,6 +73,7 @@ Patch20: 0001-Fix-qfloat16-methods-definition-without-declaration-.patch # patches 1000-2000 and above from upstream 5.12 branch # # patches 2000-3000 and above from upstream 5.13/dev branch # +Patch2000: reproducible-qrc-time.patch BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: double-conversion-devel @@ -930,7 +931,7 @@ %endif %endif -install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.qt5 +install -D -m644 %{SOURCE2} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5 # argggh, qmake is such a piece of <censored> find %{buildroot}%{libqt5_libdir} -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} + find %{buildroot}%{libqt5_libdir} -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} + @@ -1018,7 +1019,7 @@ %files common-devel %defattr(-,root,root,755) %doc *.txt LICENSE.* -%{_sysconfdir}/rpm/macros.qt5 +%{_rpmconfigdir}/macros.d/macros.qt5 %{_bindir}/moc* %{libqt5_bindir}/moc* %{_bindir}/qmake* ++++++ reproducible-qrc-time.patch ++++++ commit aa0241031c93086737d82d5c3e917a8816a77fc4 Author: Bernhard M. Wiedemann <bwiedem...@suse.de> Date: Wed Jul 11 10:05:55 2018 +0200 Use SOURCE_DATE_EPOCH Use the standard variable name in addition to the QT-specific one to make builds reproducible out-of-the-box Change-Id: I401a2a9d258e751b83ae7b83f4100d9088b9ad71 diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp index 1a7cab01df..26fc3efea2 100644 --- a/src/tools/rcc/rcc.cpp +++ b/src/tools/rcc/rcc.cpp @@ -211,6 +211,9 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib) static const quint64 sourceDate = 1000 * qgetenv("QT_RCC_SOURCE_DATE_OVERRIDE").toULongLong(); if (sourceDate != 0) lastmod = sourceDate; + static const quint64 sourceDate2 = 1000 * qgetenv("SOURCE_DATE_EPOCH").toULongLong(); + if (sourceDate2 != 0) + lastmod = sourceDate2; lib.writeNumber8(lastmod); if (text || pass1) lib.writeChar('\n');
