|
 |
b5cc75 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
b5cc75 |
index 27317c3..64d36cf 100644
|
|
|
b5cc75 |
--- a/CMakeLists.txt
|
|
|
b5cc75 |
+++ b/CMakeLists.txt
|
|
|
b5cc75 |
@@ -100,8 +100,6 @@ if(Q_WS_X11)
|
|
|
b5cc75 |
|
|
|
b5cc75 |
add_feature_info("Automated testing of X clients" X11_XTest_FOUND
|
|
|
b5cc75 |
"The X11 Testing Resource extension library is useful for automated testing of X clients")
|
|
|
b5cc75 |
- add_feature_info("libXau" X11_Xau_FOUND "The X11 Authorization Protocol library may be used by KDM")
|
|
|
b5cc75 |
- add_feature_info("LibXdmcp" X11_Xdmcp_FOUND "The X Display Manager Control Protocol library may be used by KDM")
|
|
|
b5cc75 |
if(NOT X11_Xkbfile_FOUND)
|
|
|
b5cc75 |
message(FATAL_ERROR "The X11 keyboard layout library was not found. Required for building keyboard modules.")
|
|
|
b5cc75 |
endif()
|
|
|
b5cc75 |
@@ -262,11 +260,6 @@ if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
|
|
|
b5cc75 |
macro_optional_add_subdirectory(appmenu)
|
|
|
b5cc75 |
endif(NOT WIN32)
|
|
|
b5cc75 |
|
|
|
b5cc75 |
- if(X11_Xau_FOUND AND X11_Xdmcp_FOUND)
|
|
|
b5cc75 |
- macro_optional_add_subdirectory( kdm )
|
|
|
b5cc75 |
- else(X11_Xau_FOUND AND X11_Xdmcp_FOUND)
|
|
|
b5cc75 |
- message(STATUS "Xau lib or Xdmcp lib was missing. kdm will not compile")
|
|
|
b5cc75 |
- endif(X11_Xau_FOUND AND X11_Xdmcp_FOUND)
|
|
|
b5cc75 |
endif(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
|
|
|
b5cc75 |
|
|
|
b5cc75 |
if(NOT WIN32)
|
|
|
b5cc75 |
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
|
|
b5cc75 |
index af00f4c..d49d590 100644
|
|
|
b5cc75 |
--- a/doc/CMakeLists.txt
|
|
|
b5cc75 |
+++ b/doc/CMakeLists.txt
|
|
|
b5cc75 |
@@ -1,4 +1,3 @@
|
|
|
b5cc75 |
-add_subdirectory(kdm)
|
|
|
b5cc75 |
add_subdirectory(klipper)
|
|
|
b5cc75 |
add_subdirectory(kfontview)
|
|
|
b5cc75 |
add_subdirectory(kmenuedit)
|
|
|
b5cc75 |
diff --git a/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake b/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake
|
|
|
b5cc75 |
index 3cf746b..0af75fa 100644
|
|
|
b5cc75 |
--- a/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake
|
|
|
b5cc75 |
+++ b/kdm/kfrontend/sessions/kde-plasma-safe.desktop.cmake
|
|
|
b5cc75 |
@@ -1,8 +1,8 @@
|
|
|
b5cc75 |
[Desktop Entry]
|
|
|
b5cc75 |
Encoding=UTF-8
|
|
|
b5cc75 |
Type=XSession
|
|
|
b5cc75 |
-Exec=${BIN_INSTALL_DIR}/startkde --failsafe
|
|
|
b5cc75 |
-TryExec=${BIN_INSTALL_DIR}/startkde
|
|
|
b5cc75 |
+Exec=/usr/bin/startkde --failsafe
|
|
|
b5cc75 |
+TryExec=/usr/bin/startkde
|
|
|
b5cc75 |
DesktopNames=KDE
|
|
|
b5cc75 |
Name=KDE Plasma Workspace (failsafe session)
|
|
|
b5cc75 |
Name[ar]=مساحة عمل بلازما كدي (الجلسة الآمنة)
|
|
|
b5cc75 |
diff --git a/kdm/kfrontend/sessions/kde-plasma.desktop.cmake b/kdm/kfrontend/sessions/kde-plasma.desktop.cmake
|
|
|
b5cc75 |
index 613f7dd..40089bb 100644
|
|
|
b5cc75 |
--- a/kdm/kfrontend/sessions/kde-plasma.desktop.cmake
|
|
|
b5cc75 |
+++ b/kdm/kfrontend/sessions/kde-plasma.desktop.cmake
|
|
|
b5cc75 |
@@ -1,8 +1,8 @@
|
|
|
b5cc75 |
[Desktop Entry]
|
|
|
b5cc75 |
Encoding=UTF-8
|
|
|
b5cc75 |
Type=XSession
|
|
|
b5cc75 |
-Exec=${BIN_INSTALL_DIR}/startkde
|
|
|
b5cc75 |
-TryExec=${BIN_INSTALL_DIR}/startkde
|
|
|
b5cc75 |
+Exec=/usr/bin/startkde
|
|
|
b5cc75 |
+TryExec=/usr/bin/startkde
|
|
|
b5cc75 |
DesktopNames=KDE
|
|
|
b5cc75 |
Name=KDE Plasma Workspace
|
|
|
b5cc75 |
Name[ar]=مساحة عمل بلازما كدي
|