* [bug#32241] [PATCH] gnu: sddm: Update to 0.18.0.
@ 2018-07-21 17:04 Stefan Stefanović
2018-07-22 14:28 ` bug#32241: " Marius Bakke
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Stefanović @ 2018-07-21 17:04 UTC (permalink / raw)
To: 32241
[-- Attachment #1.1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #1.2: Type: text/html, Size: 26 bytes --]
[-- Attachment #2: 0001-gnu-sddm-Update-to-0.18.0.patch --]
[-- Type: text/x-patch, Size: 3780 bytes --]
From 5b7a2242eb69ffc6d167188d775dddc23c0182e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= <stefanx2ovic@gmail.com>
Date: Sat, 21 Jul 2018 18:52:33 +0200
Subject: [PATCH] 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.
---
gnu/local.mk | 2 +-
gnu/packages/display-managers.scm | 5 ++--
.../sddm-fix-build-with-qt-5.11-1024.patch | 28 -------------------
3 files changed, 3 insertions(+), 32 deletions(-)
delete mode 100644 gnu/packages/patches/sddm-fix-build-with-qt-5.11-1024.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index e55c2bf3b..beeb412e1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -18,6 +18,7 @@
# Copyright © 2017, 2018 Gábor Boskovits <boskovits@gmail.com>
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
+# Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
#
# This file is part of GNU Guix.
#
@@ -1123,7 +1124,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 b0ad3df78..a4ed601ec 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -135,7 +135,7 @@ Qt-style API for Wayland clients.")
(define-public sddm
(package
(name "sddm")
- (version "0.17.0")
+ (version "0.18.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -144,8 +144,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"))))
+ "0icyi9nqgbp2v6dwh3n3jzff9jv2xy8d4rbsz89hd65x7c3hrv87"))))
(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 53c184230..000000000
--- 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)
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#32241: [PATCH] gnu: sddm: Update to 0.18.0.
2018-07-21 17:04 [bug#32241] [PATCH] gnu: sddm: Update to 0.18.0 Stefan Stefanović
@ 2018-07-22 14:28 ` Marius Bakke
0 siblings, 0 replies; 2+ messages in thread
From: Marius Bakke @ 2018-07-22 14:28 UTC (permalink / raw)
To: Stefan Stefanović, 32241-done
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
Stefan Stefanović <stefanx2ovic@gmail.com> writes:
> From 5b7a2242eb69ffc6d167188d775dddc23c0182e7 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Stefan=20Stefanovi=C4=87?= <stefanx2ovic@gmail.com>
> Date: Sat, 21 Jul 2018 18:52:33 +0200
> Subject: [PATCH] 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.
Thanks! Pushed as 706a6ff1544f2fc4baa1d4d2e1cd093a41411906.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-22 14:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-21 17:04 [bug#32241] [PATCH] gnu: sddm: Update to 0.18.0 Stefan Stefanović
2018-07-22 14:28 ` bug#32241: " Marius Bakke
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.