01/05: Revert "gnu: sddm: Fix CMake build."

[Efraim Flashner]

efraim pushed a commit to branch master
in repository guix.

commit 02062f42e66234fbb414c35abd75123f0ad2146d
Author: Efraim Flashner <address@hidden>
Date:   Tue Jul 24 22:38:03 2018 +0300

    Revert "gnu: sddm: Fix CMake build."
    
    This reverts commit 8674abb1dda0278f81b5965985e6b78497aab386.
    
    This is no longer necessary after the upgrade to Qt-5.11.1.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/display-managers.scm                  |  4 +---
 .../patches/sddm-fix-build-with-qt-5.11-1024.patch | 28 ----------------------
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 5ae074d..bb333a6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1123,7 +1123,6 @@ 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 b0ad3df..6e3d491 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -6,7 +6,6 @@
 ;;; 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.
 ;;;
@@ -144,8 +143,7 @@ Qt-style API for Wayland clients.")
                     "sddm-" version ".tar.xz"))
               (sha256
                (base32
-                "0ch6rdppgy2vbzw0c2x9a4c6ry46vx7p6b76d8xbh2nvxh23xv0k"))
-              (patches (search-patches 
"sddm-fix-build-with-qt-5.11-1024.patch"))))
+                "0ch6rdppgy2vbzw0c2x9a4c6ry46vx7p6b76d8xbh2nvxh23xv0k"))))
     (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
deleted file mode 100644
index 53c1842..0000000
--- a/gnu/packages/patches/sddm-fix-build-with-qt-5.11-1024.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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)