[neon/kde/baloo/Neon/unstable] debian/patches: Remove unneeded patches to fix build crash

Julian Steinmann null at kde.org
Sat Dec 25 08:20:16 GMT 2021


Git commit 42d4c212533d60940640754a45d152772d2a49ee by Julian Steinmann.
Committed on 25/12/2021 at 08:20.
Pushed by xyquadrat into branch 'Neon/unstable'.

Remove unneeded patches to fix build crash

Debian has dropped these patches long ago
(https://salsa.debian.org/qt-kde-team/kde/baloo/-/commits/master/debian/patches)
They seem to not be needed anymore. Since they cause builds to crash due to malformed patches, let's drop them.

D  +0    -28   debian/patches/disable_failing_test
D  +0    -40   debian/patches/fix-822499.patch
M  +1    -1    debian/patches/series

https://invent.kde.org/neon/kde/baloo/commit/42d4c212533d60940640754a45d152772d2a49ee

diff --git a/debian/patches/disable_failing_test b/debian/patches/disable_failing_test
deleted file mode 100644
index 6271ba9..0000000
--- a/debian/patches/disable_failing_test
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Sat, 30 Apr 2016 15:09:55 +0200
-Subject: disable_failing_test
-
-===================================================================
----
- autotests/unit/lib/CMakeLists.txt | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/autotests/unit/lib/CMakeLists.txt b/autotests/unit/lib/CMakeLists.txt
-index d3490ed..700446a 100644
---- a/autotests/unit/lib/CMakeLists.txt
-+++ b/autotests/unit/lib/CMakeLists.txt
-@@ -5,10 +5,10 @@ ecm_add_test(queryserializationtest.cpp
-     TEST_NAME "queryserializationtest"
-     LINK_LIBRARIES Qt5::Test KF5::Baloo
- )
--ecm_add_test(filemonitortest.cpp
--    TEST_NAME "filemonitortest"
--    LINK_LIBRARIES Qt5::Test Qt5::DBus KF5::Baloo
--)
-+# ecm_add_test(filemonitortest.cpp
-+#     TEST_NAME "filemonitortest"
-+#     LINK_LIBRARIES Qt5::Test Qt5::DBus KF5::Baloo
-+# )
- 
- #
- # Advanced Query Parser
diff --git a/debian/patches/fix-822499.patch b/debian/patches/fix-822499.patch
deleted file mode 100644
index 3f72531..0000000
--- a/debian/patches/fix-822499.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Sat, 30 Apr 2016 15:09:55 +0200
-Subject: fix-822499
-
-Description: Fix FTBFS due missing includes
-Author: Tobias Frost <tobi at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822499
-Forwarded: no
-Last-Update: 2016-04-26
----
- src/file/extractor/autotests/iohandlertest.cpp | 2 ++
- src/file/timeestimator.cpp                     | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/file/extractor/autotests/iohandlertest.cpp b/src/file/extractor/autotests/iohandlertest.cpp
-index 2c8eeaa..e4772e6 100644
---- a/src/file/extractor/autotests/iohandlertest.cpp
-+++ b/src/file/extractor/autotests/iohandlertest.cpp
-@@ -30,6 +30,8 @@
- 
- #include "../iohandler.h"
- 
-+#include <cmath>
-+
- namespace Baloo {
- class IOHandlerTest : public QObject
- {
-diff --git a/src/file/timeestimator.cpp b/src/file/timeestimator.cpp
-index cf91df7..a2affe5 100644
---- a/src/file/timeestimator.cpp
-+++ b/src/file/timeestimator.cpp
-@@ -25,6 +25,8 @@
- #include "timeestimator.h"
- #include "filecontentindexerprovider.h"
- 
-+#include <math.h>
-+
- using namespace Baloo;
- 
- TimeEstimator::TimeEstimator(FileIndexerConfig *config, QObject* parent)
diff --git a/debian/patches/series b/debian/patches/series
index 4168e54..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-disable_failing_test
+


More information about the Neon-commits mailing list