From 5d4afcb68fdff18aa9e44d1d111130cdb43e9ba4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 12 Apr 2015 22:29:58 -0500
Subject: Remove call to pthread_cancel() in kdesktop_lock This resolves a
 sporadic deadlock during kdesktop_lock termination (cherry picked from commit
 e569dd46ac06ef5a5f2ad03a311640e1834c749f)

---
 kdesktop/lock/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kdesktop/lock/CMakeLists.txt')

diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 256c6a498..2bbe4b289 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -38,6 +38,6 @@ set( ${target}_SRCS
 tde_add_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK kdesktopsettings-static dmctl-static tdeio-shared Xext
-    ${GL_LIBRARIES} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
+    pthread ${GL_LIBRARIES} "${LINKER_IMMEDIATE_BINDING_FLAGS}"
   DESTINATION ${BIN_INSTALL_DIR}
 )
-- 
cgit v1.2.1