[neon/qt/qttools/Neon/testing] debian/patches: drop patches

Harald Sitter null at kde.org
Tue May 18 14:44:46 BST 2021


Git commit e5f744cb2fa991b708fc3d9603f725bcc9ffcec4 by Harald Sitter.
Committed on 18/05/2021 at 13:44.
Pushed by sitter into branch 'Neon/testing'.

drop patches

don't apply cleanly on kde's qt fork. chances are they've been applied
already. in any even reproducible builds aren't a concern on neon at
this time

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

https://invent.kde.org/neon/qt/qttools/commit/e5f744cb2fa991b708fc3d9603f725bcc9ffcec4

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


More information about the Neon-commits mailing list