[PATCH] gnu: sddm: Fix CMake build.

[PATCH] gnu: sddm: Fix CMake build.

[Stefan Stefanović]

[-- Attachment #1.1: Type: text/plain, Size: 303 bytes --]

Hello.

I could not compile the sddm display manager because the qt5_use_modules
macro is deprecated.

So I made this patch which is based on the sddm upstream patch
<https://github.com/sddm/sddm/pull/1024/files/7ac4e53c814e405fceade0fa75366c092a521c32#diff-af3b638bc2a3e6c650974192a53c7291>
.

Stefan.

[-- Attachment #1.2: Type: text/html, Size: 522 bytes --]

[-- Attachment #2: 0001-gnu-sddm-Fix-CMake-build.patch --]
[-- Type: text/x-patch, Size: 2723 bytes --]

From afc5c6c1b6ee9f2221953349c1926206f5e314cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= <stefanx2ovic@gmail.com>
Date: Thu, 31 May 2018 19:42:06 +0200
Subject: [PATCH] gnu: sddm: Fix CMake build.

---
 gnu/packages/display-managers.scm             |  4 ++-
 .../sddm-fix-build-with-qt-5.11-1024.patch    | 28 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/sddm-fix-build-with-qt-5.11-1024.patch

diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 6e3d4912d..b0ad3df78 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
 ;;;
 ;;; 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 000000000..9dd7e4db6
--- /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)
-- 
2.17.0

[PATCH] gnu: sddm: Fix CMake build.

[Rutger Helling]

[-- Attachment #1: Type: text/plain, Size: 135 bytes --]

Thanks for this! You forgot to add a commit log and to add the patch to
gnu/local.mk. I've made those changes and pushed your patch.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] gnu: sddm: Fix CMake build.

[Stefan Stefanović]

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

Thank you.

On Fri, Jun 1, 2018 at 12:20 PM, Rutger Helling <rhelling@mykolab.com>
wrote:

> Thanks for this! You forgot to add a commit log and to add the patch to
> gnu/local.mk. I've made those changes and pushed your patch.
>

[-- Attachment #2: Type: text/html, Size: 574 bytes --]