[SCM] Qt 4 packaging branch, master, updated. debian/4.8.7+dfsg-5-2-gbd794f2

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=bd794f2

The following commit has been merged in the master branch:
commit bd794f277b763f295543a3a8988916b59c98dd7b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Feb 10 10:52:44 2016 -0300

    Backport patch from qttools5 to make qch files reproducible.
---
 debian/changelog                                   |  5 +++
 ...estamps_with_fixed_date_in_qhelpgenerator.patch | 51 ++++++++++++++++++++++
 debian/patches/series                              |  3 ++
 3 files changed, 59 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4c39b50..29bc29a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qt4-x11 (4:4.8.7+dfsg-6) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Add Eduard Sanou's backport patch from qttools5 to make qch files
+    reproducible by replacing the current time by a fixed date
+    (Closes: #814280). Thanks Eduard!
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 10 Feb 2016 10:44:21 -0300
 
 qt4-x11 (4:4.8.7+dfsg-5) unstable; urgency=medium
diff --git a/debian/patches/replace_timestamps_with_fixed_date_in_qhelpgenerator.patch b/debian/patches/replace_timestamps_with_fixed_date_in_qhelpgenerator.patch
new file mode 100644
index 0000000..3f6c138
--- /dev/null
+++ b/debian/patches/replace_timestamps_with_fixed_date_in_qhelpgenerator.patch
@@ -0,0 +1,51 @@
+Description: Replace timestamps from qhelpgenerator by a fixed date 
+ In order to make qhelpgenerator output reproducible, we need a way to get
+ deterministic embedded timestaps.  Backport the patch from qttools5 [1] to
+ make qch files reproducible by replacing the current time by a fixed date.  
+
+ [1] https://codereview.qt-project.org/#/c/106296/
+Author: Eduard Sanou <dhole at openmailbox.org>
+
+---
+
+Index: qt4-x11-4.8.7+dfsg/tools/assistant/lib/qhelpgenerator.cpp
+===================================================================
+--- qt4-x11-4.8.7+dfsg.orig/tools/assistant/lib/qhelpgenerator.cpp
++++ qt4-x11-4.8.7+dfsg/tools/assistant/lib/qhelpgenerator.cpp
+@@ -380,9 +380,7 @@ bool QHelpGenerator::createTables()
+ 
+     d->query->exec(QLatin1String("INSERT INTO MetaDataTable VALUES('qchVersion', '1.0')"));
+ 
+-    d->query->prepare(QLatin1String("INSERT INTO MetaDataTable VALUES('CreationDate', ?)"));
+-    d->query->bindValue(0, QDateTime::currentDateTime().toString(Qt::ISODate));
+-    d->query->exec();
++    d->query->exec(QLatin1String("INSERT INTO MetaDataTable VALUES('CreationDate', '2012-12-20T12:00:00Z')"));
+ 
+     return true;
+ }
+Index: qt4-x11-4.8.7+dfsg/tools/assistant/tools/qcollectiongenerator/main.cpp
+===================================================================
+--- qt4-x11-4.8.7+dfsg.orig/tools/assistant/tools/qcollectiongenerator/main.cpp
++++ qt4-x11-4.8.7+dfsg/tools/assistant/tools/qcollectiongenerator/main.cpp
+@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
+     CollectionConfiguration::setAddressBarVisible(helpEngine,
+          !config.hideAddressBar());
+     CollectionConfiguration::setCreationTime(helpEngine,
+-        QDateTime::currentDateTime().toTime_t());
++        QDateTime::fromString("2012-12-20T12:00:00Z", Qt::ISODate).toUTC().toTime_t());
+     CollectionConfiguration::setFullTextSearchFallbackEnabled(helpEngine,
+         config.fullTextSearchFallbackEnabled());
+ 
+Index: qt4-x11-4.8.7+dfsg/tools/assistant/tools/shared/collectionconfiguration.cpp
+===================================================================
+--- qt4-x11-4.8.7+dfsg.orig/tools/assistant/tools/shared/collectionconfiguration.cpp
++++ qt4-x11-4.8.7+dfsg/tools/assistant/tools/shared/collectionconfiguration.cpp
+@@ -282,7 +282,7 @@ const QDateTime CollectionConfiguration:
+ 
+ void CollectionConfiguration::updateLastRegisterTime(QHelpEngineCore &helpEngine)
+ {
+-    helpEngine.setCustomValue(LastRegisterTime, QDateTime::currentDateTime());
++    helpEngine.setCustomValue(LastRegisterTime, QDateTime::fromString("2012-12-20T12:00:00Z", Qt::ISODate).toUTC());
+ }
+ 
+ bool CollectionConfiguration::isNewer(const QHelpEngineCore &newer,
diff --git a/debian/patches/series b/debian/patches/series
index 3ae3ff3..3093a6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,9 @@ aarch64_arm64_qatomic_support.patch
 # Patched blessed by upstream but that will never reach Qt4.
 plugin_system_for_systemtray.patch
 
+# Patches backported from Qt5 that will never be part of Qt4.
+replace_timestamps_with_fixed_date_in_qhelpgenerator.patch
+
 # qt-copy patches
 0195-compositing-properties.diff
 0225-invalidate-tabbar-geometry-on-refresh.patch

-- 
Qt 4 packaging