zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plasma-workspace: fix configure for x11

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2015-02-03 10:22:47 +01:00
parent d080cd8e84
commit c54e953441
1 changed files with 67 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
recipes-kde/plasma/tier3/plasma-workspace/files/0002-Do-check-for-kwin-only-in-case-X11-was-found.patch
View File

@@ -8,29 +8,82 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
CMakeLists.txt | 49 +++++++++++++++++++++++++++----------------------
1 file changed, 27 insertions(+), 22 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 582b58e..d86e815 100644
index c7da3e7..7cb7522 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,6 @@ find_package(KF5 5.0.93 REQUIRED COMPONENTS Screen)
@@ -23,8 +23,7 @@ find_package(KF5 5.0.93 REQUIRED COMPONENTS Screen)
# Baloo has a different version scheme than KF5 for now
find_package(KF5 5.1 REQUIRED COMPONENTS Baloo)
find_package(KF5TextEditor)
-find_package(KWinDBusInterface CONFIG REQUIRED)
find_package(KF5WebKit)
-find_package(KF5WebKit)
+
include(KDEInstallDirs)
@@ -144,6 +143,7 @@ add_subdirectory(freespacenotifier)
add_subdirectory(klipper)
add_subdirectory(krunner)
if(HAVE_X11)
+ find_package(KWinDBusInterface CONFIG REQUIRED)
add_subdirectory(ksmserver)
endif()
add_subdirectory(ksplash)
include(KDECMakeSettings)
@@ -36,6 +35,32 @@ include(WriteBasicConfigVersionFile)
include(CheckIncludeFiles)
include(FeatureSummary)
+find_package(X11)
+set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
+ URL "http://www.x.org"
+ TYPE OPTIONAL
+ PURPOSE "Required for building the X11 based workspace")
+
+if(X11_FOUND)
+ find_package(XCB MODULE REQUIRED COMPONENTS XCB KEYSYMS)
+ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
+ if(NOT X11_SM_FOUND)
+ message(FATAL_ERROR "\nThe X11 Session Management (SM) development package could not be found.\nPlease install libSM.\n")
+ endif(NOT X11_SM_FOUND)
+
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
+endif()
+
+if(X11_FOUND AND XCB_XCB_FOUND)
+ set(HAVE_X11 1)
+endif()
+
+if(HAVE_X11)
+ find_package(KWinDBusInterface CONFIG REQUIRED)
+endif()
+
+find_package(KF5WebKit)
+
find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} CONFIG)
set_package_properties(Qt5WebKitWidgets PROPERTIES
@@ -64,26 +89,6 @@ set_package_properties(dbusmenu-qt5 PROPERTIES DESCRIPTION "Support for notifica
TYPE OPTIONAL
)
-find_package(X11)
-set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
- URL "http://www.x.org"
- TYPE OPTIONAL
- PURPOSE "Required for building the X11 based workspace")
-
-if(X11_FOUND)
- find_package(XCB MODULE REQUIRED COMPONENTS XCB KEYSYMS)
- set_package_properties(XCB PROPERTIES TYPE REQUIRED)
- if(NOT X11_SM_FOUND)
- message(FATAL_ERROR "\nThe X11 Session Management (SM) development package could not be found.\nPlease install libSM.\n")
- endif(NOT X11_SM_FOUND)
-
- find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
-endif()
-
-if(X11_FOUND AND XCB_XCB_FOUND)
- set(HAVE_X11 1)
-endif()
-
find_package(KF5Wayland CONFIG)
set_package_properties(KF5Wayland PROPERTIES
TYPE REQUIRED
--
1.8.3.1