mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 13:58:15 -05:00
gnu: sddm: Update to 0.18.0.
* gnu/packages/display-managers.scm (sddm): Update to 0.18.0. * gnu/packages/patches/sddm-fix-build-with-qt-5.11-1024.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Marius Bakke <mbakke@fastmail.com>
This commit is contained in:
parent
0c468cb52d
commit
706a6ff154
3 changed files with 3 additions and 32 deletions
|
@ -18,6 +18,7 @@
|
||||||
# Copyright © 2017, 2018 Gábor Boskovits <boskovits@gmail.com>
|
# Copyright © 2017, 2018 Gábor Boskovits <boskovits@gmail.com>
|
||||||
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
||||||
# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
|
# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
|
||||||
|
# Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
|
||||||
#
|
#
|
||||||
# This file is part of GNU Guix.
|
# This file is part of GNU Guix.
|
||||||
#
|
#
|
||||||
|
@ -1124,7 +1125,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/scotch-build-parallelism.patch \
|
%D%/packages/patches/scotch-build-parallelism.patch \
|
||||||
%D%/packages/patches/scotch-graph-diam-64.patch \
|
%D%/packages/patches/scotch-graph-diam-64.patch \
|
||||||
%D%/packages/patches/scotch-graph-induce-type-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/sdl-libx11-1.6.patch \
|
||||||
%D%/packages/patches/seq24-rename-mutex.patch \
|
%D%/packages/patches/seq24-rename-mutex.patch \
|
||||||
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
|
%D%/packages/patches/sharutils-CVE-2018-1000097.patch \
|
||||||
|
|
|
@ -135,7 +135,7 @@ (define-public greenisland
|
||||||
(define-public sddm
|
(define-public sddm
|
||||||
(package
|
(package
|
||||||
(name "sddm")
|
(name "sddm")
|
||||||
(version "0.17.0")
|
(version "0.18.0")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append
|
(uri (string-append
|
||||||
|
@ -144,8 +144,7 @@ (define-public sddm
|
||||||
"sddm-" version ".tar.xz"))
|
"sddm-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0ch6rdppgy2vbzw0c2x9a4c6ry46vx7p6b76d8xbh2nvxh23xv0k"))
|
"0icyi9nqgbp2v6dwh3n3jzff9jv2xy8d4rbsz89hd65x7c3hrv87"))))
|
||||||
(patches (search-patches "sddm-fix-build-with-qt-5.11-1024.patch"))))
|
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("extra-cmake-modules" ,extra-cmake-modules)
|
`(("extra-cmake-modules" ,extra-cmake-modules)
|
||||||
|
|
|
@ -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)
|
|
Loading…
Reference in a new issue