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

Jonathan Esk-Riddell null at kde.org
Fri Feb 3 16:19:33 GMT 2023


Git commit 6d995352e38d19c290fb78e35c6191d7fbe38350 by Jonathan Esk-Riddell.
Committed on 03/02/2023 at 16:19.
Pushed by jriddell into branch 'Neon/release'.

undo latest commit to see if that fixes break

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

https://invent.kde.org/neon/qt/qtbase/commit/6d995352e38d19c290fb78e35c6191d7fbe38350

diff --git a/debian/patches/neon_undo_latest.diff b/debian/patches/neon_undo_latest.diff
new file mode 100644
index 0000000..0db174a
--- /dev/null
+++ b/debian/patches/neon_undo_latest.diff
@@ -0,0 +1,25 @@
+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 8e6114e..8b1e176 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ qstorageinfo_linux.diff
 cross_build_mysql.diff
 cast_types_for_egl_x11_test.diff
 qtbase-avoid-hardcoding-kernel-version.patch
+neon_undo_latest.diff


More information about the Neon-commits mailing list