From patchwork Tue Apr 23 07:08:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Shu X-Patchwork-Id: 63306 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 58B7827BBEA; Tue, 23 Apr 2024 08:10:05 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EB11C27BBE2 for ; Tue, 23 Apr 2024 08:10:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzAHm-0004OE-W3; Tue, 23 Apr 2024 03:09:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzAHj-0004Nz-Nx for guix-patches@gnu.org; Tue, 23 Apr 2024 03:09:47 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rzAHj-0000xa-F1 for guix-patches@gnu.org; Tue, 23 Apr 2024 03:09:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rzAHz-0002xD-HH for guix-patches@gnu.org; Tue, 23 Apr 2024 03:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70527] [PATCH] services: sddm: Disable wayland display-service Resent-From: Feng Shu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Apr 2024 07:10:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70527 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70527@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches" Received: via spool by submit@debbugs.gnu.org id=B.171385614711082 (code B ref -1); Tue, 23 Apr 2024 07:10:03 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2024 07:09:07 +0000 Received: from localhost ([127.0.0.1]:50408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzAH3-0002sZ-Bl for submit@debbugs.gnu.org; Tue, 23 Apr 2024 03:09:06 -0400 Received: from lists.gnu.org ([2001:470:142::17]:42598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzAGx-0002r2-HF for submit@debbugs.gnu.org; Tue, 23 Apr 2024 03:09:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rzAGa-0004IL-Ln for guix-patches@gnu.org; Tue, 23 Apr 2024 03:08:36 -0400 Received: from m15.mail.163.com ([45.254.50.220]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzAGU-0000rJ-9n for guix-patches@gnu.org; Tue, 23 Apr 2024 03:08:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version: Content-Type; bh=t4u0gPufZ3Xec0TpglWvC9dJ2lseAfvUPwBLRKHlGQc=; b=fL6HxxZ7FCWs4Mzn/d6aYcG9StO9dTaKEZrgiigsukcaXH0i5O0VYbwU6oX7d0 dxKRltTFjC4BuhEsVtYTlQZ7U4CD/8sUa+31grlXHS95cCKk/VpbzV8omGUbpGYX Tqtu4XhnqpToQ9m8DX63gH6oG6yL6pDWsx4Zc5R+ALxzo= Received: from Tumashu (unknown [218.92.14.78]) by gzga-smtp-mta-g0-2 (Coremail) with SMTP id _____wD3f79mXidmfQoiCA--.50457S2; Tue, 23 Apr 2024 15:08:22 +0800 (CST) From: Feng Shu Date: Tue, 23 Apr 2024 15:08:22 +0800 Message-ID: <87le5436ah.fsf@163.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-CM-TRANSID: _____wD3f79mXidmfQoiCA--.50457S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxAFWkWF48Xw48Jw13Zw17GFg_yoW5XFykpF WjgF48tFZFqFsrXrs8WFyUWrW5W34kKFW3CrsIya47Xw4DCr9FywsIkr13WwsxXFn3GFy5 Xa4F9FsI9w1xu3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zREtCxUUUUU= X-Originating-IP: [218.92.14.78] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiLwjJ1GVODNZiiwABsj Received-SPF: pass client-ip=45.254.50.220; envelope-from=tumashu@163.com; helo=m15.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From 97e36b18e3eefdf5d5fa86caf55383ad219b0340 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Tue, 23 Apr 2024 14:37:13 +0800 Subject: [PATCH] services: sddm: Disable wayland display-service * gnu/services/sddm.scm (): wayland is not walid value of display-server. (sddm-configuration-file): do not use sddm-configuration-display-server at the moment, for user config: (display-server "wayland"), will let user's addm show blank screen when sddm update to 0.20. * doc/guix.texi (X Window): update display-server doc of sddm-service-type. Change-Id: I75354eb75f54263389e5839e152fb85d4351aece --- doc/guix.texi | 4 ++-- gnu/services/sddm.scm | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 04e33da1a9..5abdd84d24 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -23160,8 +23160,8 @@ The available fields are: The SDDM package to use. @item @code{display-server} (default: "x11") -Select display server to use for the greeter. Valid values are -@samp{"x11"} or @samp{"wayland"}. +Select display server to use for the greeter. Valid value is +@samp{"x11"}, currently do not support @samp{"x11-user"} and @samp{"wayland"}. @item @code{numlock} (default: "on") Valid values are @samp{"on"}, @samp{"off"} or @samp{"none"}. diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 48695e2806..a0859ccca5 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -45,8 +45,7 @@ (define-record-type* (default sddm)) ;; [General] - ;; valid values are x11 and wayland - ;; currently doesn't do anything is enabled by wayland greeter PR + ;; valid values is x11, currently do not support x11-user and wayland. (display-server sddm-configuration-display-server (default "x11")) ;; valid values are on, off or none @@ -117,7 +116,14 @@ (define-record-type* (define (sddm-configuration-file config) (mixed-text-file "sddm.conf" " [General] -DisplayServer=" (sddm-configuration-display-server config) " +DisplayServer=" (or "x11" + ;; sddm-0.20 begin support x11-user and wayland + ;; value, but sddm-service-type do not support them + ;; at the moment, setting to x11-user and wayland + ;; will let sddm show blank screen, update here + ;; when sddm-service-type really support x11-user + ;; and wayland. + (sddm-configuration-display-server config)) " Numlock=" (sddm-configuration-numlock config) " HaltCommand=" (sddm-configuration-halt-command config) " RebootCommand=" (sddm-configuration-reboot-command config) "