[neon/qt/qttools/Neon/release] debian: Drop reproducible_lastModified.diff, included in the new release.

[Dmitry Shachnev]

Git commit 44200bb244f69bc2d035ee099be0845a15bc1fcb by Dmitry Shachnev.
Committed on 05/03/2022 at 18:31.
Pushed by jriddell into branch 'Neon/release'.

Drop reproducible_lastModified.diff, included in the new release.

M  +1    -0    debian/changelog
D  +0    -23   debian/patches/reproducible_lastModified.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qttools/commit/44200bb244f69bc2d035ee099be0845a15bc1fcb

diff --git a/debian/changelog b/debian/changelog
index 73ce6b1..3baa93f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qttools-opensource-src (5.15.3-1) UNRELEASED; urgency=medium
   * Update debian/watch.
   * Bump Qt build-dependencies to 5.15.3.
   * Bump Standards-Version to 4.6.0, no changes needed.
+  * Drop reproducible_lastModified.diff, included in the new release.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 05 Mar 2022 20:44:59 +0300
 
diff --git a/debian/patches/reproducible_lastModified.diff b/debian/patches/reproducible_lastModified.diff
deleted file mode 100644
index c33ba4e..0000000
--- a/debian/patches/reproducible_lastModified.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: clamp registered collection time-stamp to SOURCE_DATE_EPOCH if set
-Origin: upstream, https://code.qt.io/cgit/qt/qttools.git/commit/?id=33693a928986006d
-Last-Update: 2020-12-04
-
---- a/src/assistant/help/qhelpcollectionhandler.cpp
-+++ b/src/assistant/help/qhelpcollectionhandler.cpp
-@@ -2197,7 +2197,15 @@ bool QHelpCollectionHandler::registerInd
-     m_query->addBindValue(fileName);
-     const QFileInfo fi(absoluteDocPath(fileName));
-     m_query->addBindValue(fi.size());
--    m_query->addBindValue(fi.lastModified().toString(Qt::ISODate));
-+    QDateTime lastModified = fi.lastModified();
-+    if (qEnvironmentVariableIsSet("SOURCE_DATE_EPOCH")) {
-+        const QString sourceDateEpochStr = qEnvironmentVariable("SOURCE_DATE_EPOCH");
-+        bool ok;
-+        const qlonglong sourceDateEpoch = sourceDateEpochStr.toLongLong(&ok);
-+        if (ok && sourceDateEpoch < lastModified.toSecsSinceEpoch())
-+            lastModified.setSecsSinceEpoch(sourceDateEpoch);
-+    }
-+    m_query->addBindValue(lastModified.toString(Qt::ISODate));
-     if (!m_query->exec())
-         return false;
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8c11212..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-reproducible_lastModified.diff