[neon/qt/qtbase/Neon/release] debian/patches: Revert "undo latest commit to see if that fixes break"

[Jonathan Esk-Riddell]

Git commit fbaca1b8aadf76454fe260ada730a4edd85dda71 by Jonathan Esk-Riddell.
Committed on 04/02/2023 at 13:05.
Pushed by jriddell into branch 'Neon/release'.

Revert "undo latest commit to see if that fixes break"

This reverts commit 6d995352e38d19c290fb78e35c6191d7fbe38350.

D  +0    -25   debian/patches/neon_undo_latest.diff
M  +0    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtbase/commit/fbaca1b8aadf76454fe260ada730a4edd85dda71

diff --git a/debian/patches/neon_undo_latest.diff b/debian/patches/neon_undo_latest.diff
deleted file mode 100644
index 0db174a..0000000
--- a/debian/patches/neon_undo_latest.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 4f2384ebf248ee7beced6997e62e26c2926c761c
-Author: Jonathan Esk-Riddell <jr at jriddell.org>
-Date:   Fri Feb 3 16:18:56 2023 +0000
-
-     Revert "correctly set up ref counting in QThreadPool::tryStart(std::function)"
-    
-    This reverts commit 9853ce1045834f4f4b94a4745a473a1cda8c60fa.
-
-diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp
-index 8aa06a4c8f..40cc646519 100644
---- a/src/corelib/thread/qthreadpool.cpp
-+++ b/src/corelib/thread/qthreadpool.cpp
-@@ -602,12 +602,8 @@ bool QThreadPool::tryStart(std::function<void()> functionToRun)
-         return false;
- 
-     QRunnable *runnable = QRunnable::create(std::move(functionToRun));
--    Q_ASSERT(runnable->ref == 0);
--    ++runnable->ref;
-     if (d->tryStart(runnable))
-         return true;
--    --runnable->ref;
--    Q_ASSERT(runnable->ref == 0);
-     delete runnable;
-     return false;
- }
diff --git a/debian/patches/series b/debian/patches/series
index 8b1e176..8e6114e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,4 +25,3 @@ qstorageinfo_linux.diff
 cross_build_mysql.diff
 cast_types_for_egl_x11_test.diff
 qtbase-avoid-hardcoding-kernel-version.patch
-neon_undo_latest.diff