01/01: gnu: sddm: Fix CMake build.

[Rutger Helling]

rhelling pushed a commit to branch master
in repository guix.

commit 8674abb1dda0278f81b5965985e6b78497aab386
Author: Stefan Stefanović <address@hidden>
Date:   Fri Jun 1 12:09:23 2018 +0200

    gnu: sddm: Fix CMake build.
    
    * gnu/packages/display-managers.scm (sddm): Fix CMake build.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/patches/sddm-fix-build-with-qt-5.11-1024.patch: New file.
    
    Signed-off-by: Rutger Helling <address@hidden>
---
 gnu/local.mk                                       |  1 +
 gnu/packages/display-managers.scm                  |  4 +++-
 .../patches/sddm-fix-build-with-qt-5.11-1024.patch | 28 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 7734586f..db04ee0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1093,6 +1093,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/scotch-build-parallelism.patch          \
   %D%/packages/patches/scotch-graph-diam-64.patch              \
   %D%/packages/patches/scotch-graph-induce-type-64.patch       \
+  %D%/packages/patches/sddm-fix-build-with-qt-5.11-1024.patch  \
   %D%/packages/patches/sdl-libx11-1.6.patch                    \
   %D%/packages/patches/seq24-rename-mutex.patch                        \
   %D%/packages/patches/sharutils-CVE-2018-1000097.patch                \
diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index 6e3d491..b0ad3df 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2017 Sou Bunnbu <address@hidden>
 ;;; Copyright © 2017 Marius Bakke <address@hidden>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2018 Stefan Stefanović <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -143,7 +144,8 @@ Qt-style API for Wayland clients.")
                     "sddm-" version ".tar.xz"))
               (sha256
                (base32
-                "0ch6rdppgy2vbzw0c2x9a4c6ry46vx7p6b76d8xbh2nvxh23xv0k"))))
+                "0ch6rdppgy2vbzw0c2x9a4c6ry46vx7p6b76d8xbh2nvxh23xv0k"))
+              (patches (search-patches 
"sddm-fix-build-with-qt-5.11-1024.patch"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
diff --git a/gnu/packages/patches/sddm-fix-build-with-qt-5.11-1024.patch 
b/gnu/packages/patches/sddm-fix-build-with-qt-5.11-1024.patch
new file mode 100644
index 0000000..53c1842
--- /dev/null
+++ b/gnu/packages/patches/sddm-fix-build-with-qt-5.11-1024.patch
@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2efc649..8903b52 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,7 +95,7 @@
+ find_package(XKB REQUIRED)
+
+ # Qt 5
+-find_package(Qt5 5.6.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools)
++find_package(Qt5 5.8.0 CONFIG REQUIRED Core DBus Gui Qml Quick LinguistTools 
Test)
+
+ # find qt5 imports dir
+ get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index c9d935a..bb85ddd 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -2,9 +2,8 @@
+
+ include_directories(../src/common)
+
+-
+ set(ConfigurationTest_SRCS ConfigurationTest.cpp 
../src/common/ConfigReader.cpp)
+ add_executable(ConfigurationTest ${ConfigurationTest_SRCS})
+ add_test(NAME Configuration COMMAND ConfigurationTest)
+
+-qt5_use_modules(ConfigurationTest Test)
++target_link_libraries(ConfigurationTest Qt5::Core Qt5::Test)