From bfbcf19a2fbfa301b8796f19b71fdee3e8c4fce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
Date: Sun, 12 Oct 2014 18:24:29 +0200
Subject: Fix hardcoded link flag to "dl" library Fix "dlopen" function
 detection

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

(limited to 'kdesktop')

diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index 80ea9c21a..743a3453e 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -97,7 +97,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
   LINK
     kdesktopsettings-static bgnd-static dmctl-static
     konq-shared tdeutils-shared
-    ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext dl
+    ${XRENDER_LIBRARIES} ${XCURSOR_LIBRARIES} Xext ${DL_LIBRARIES}
     ${XSS_LIBRARIES} ${DBUS_1_TQT_LIBRARIES}
 )
 
-- 
cgit v1.2.3


From d3ce4fa7931f1a69fb3f6bd759a864db09ebbdc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <francois.andriot@free.fr>
Date: Sun, 12 Oct 2014 20:00:56 +0200
Subject: Fix FTBFS due to linux specific headers

---
 kdesktop/lock/lockprocess.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'kdesktop')

diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 773a0710a..ff820f0f4 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -79,7 +79,9 @@
 
 #include <kcrash.h>
 
+#ifdef __Linux__
 #include <linux/stat.h>
+#endif
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-- 
cgit v1.2.3


From 68cfc4fec0fed7ef4da9f03da68bd61900654ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 13 Oct 2014 00:50:09 +0200
Subject: Fix FTBFS caused by typo in commit d3ce4fa7

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

(limited to 'kdesktop')

diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index ff820f0f4..1de0b6753 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -79,7 +79,7 @@
 
 #include <kcrash.h>
 
-#ifdef __Linux__
+#ifdef __linux__
 #include <linux/stat.h>
 #endif
 
-- 
cgit v1.2.3