rpm/libqt5-qtbase
SHA256
1
0
Fork 0
forked from pool/libqt5-qtbase
Code Pull Requests Activity

Accepting request 663360 from KDE:Qt5

Browse Source 
- 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)

- Use upstream-recommended %{_rpmconfigdir}/macros.d directory
  for the rpm macros.

OBS-URL: https://build.opensuse.org/request/show/663360
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=92
This commit is contained in:
Dominique Leuenberger 2019-01-15 12:13:30 +00:00 committed by Git OBS Bridge
parent 21fa05ea88
commit 9515d2adab
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libqt5-qtbase.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jan 7 13:56:29 UTC 2019 - bwiedemann@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)
-------------------------------------------------------------------
Thu Dec 20 17:37:42 UTC 2018 - Antonio Larrosa <alarrosa@suse.com>
@ -7,6 +14,12 @@ Thu Dec 20 17:37:42 UTC 2018 - Antonio Larrosa <alarrosa@suse.com>
building also when qt modules other than qtbase include qfloat16.h
from the system qtbase package (boo#1092425, qtbug#72725)
-------------------------------------------------------------------
Wed Dec 19 19:54:05 UTC 2018 - Todd R <toddrme2178@gmail.com>
- Use upstream-recommended %{_rpmconfigdir}/macros.d directory
for the rpm macros.
-------------------------------------------------------------------
Thu Dec 6 13:35:10 UTC 2018 - fabian@ritter-vogt.de

5
libqt5-qtbase.spec
View File

@ -73,6 +73,7 @@ Patch19: qapplication-emit-palettechanged.patch
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 @@ popd
%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 @@ popd
%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*

26
reproducible-qrc-time.patch Normal file
View File

@ -0,0 +1,26 @@
commit aa0241031c93086737d82d5c3e917a8816a77fc4
Author: Bernhard M. Wiedemann <bwiedemann@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');