From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 6HqzDNqlqWLhMQEAbAwnHQ (envelope-from ) for ; Wed, 15 Jun 2022 11:26:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id qK+rC9qlqWImmwAAG6o9tA (envelope-from ) for ; Wed, 15 Jun 2022 11:26:50 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A94852B442 for ; Wed, 15 Jun 2022 11:26:49 +0200 (CEST) Received: from localhost ([::1]:35398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1PIW-0005sv-0l for larch@yhetil.org; Wed, 15 Jun 2022 05:26:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1PB1-00006W-Jl for guix-patches@gnu.org; Wed, 15 Jun 2022 05:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1PAz-0002xi-Q6 for guix-patches@gnu.org; Wed, 15 Jun 2022 05:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o1PAz-0006rD-KB for guix-patches@gnu.org; Wed, 15 Jun 2022 05:19:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49969] [PATCH v12 6/8] gnu: admin: Add libseat 0.8.0 and move seatd. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Jun 2022 09:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49969 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49969@debbugs.gnu.org Received: via spool by 49969-submit@debbugs.gnu.org id=B49969.165528468926278 (code B ref 49969); Wed, 15 Jun 2022 09:19:01 +0000 Received: (at 49969) by debbugs.gnu.org; 15 Jun 2022 09:18:09 +0000 Received: from localhost ([127.0.0.1]:36519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1PA8-0006pl-SW for submit@debbugs.gnu.org; Wed, 15 Jun 2022 05:18:09 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:43560 helo=nomad-cl1.muradm.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1P9r-0006ng-3W for 49969@debbugs.gnu.org; Wed, 15 Jun 2022 05:17:51 -0400 Received: from localhost ([127.0.0.1]:35092) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1o1P7f-0003xl-U6 for 49969@debbugs.gnu.org; Wed, 15 Jun 2022 09:15:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=po1J4ShuM0sOY+4h1QcvWtZw4wM1NBH6QqFVX7ESczI=; b=q8oqcqF6pS3dZFg80xZZwOqIf9 2ylwx2pYwN1/Trl9nkeiygPHwn94Dlasi3nJpw2BKrQudY549Fu974JCQCTiByOrf6X9heMMnP4tx 1wch+sNjzgu2j2jYAim2H1jwbbqUQM8atOBXD5s6NwN6ahPPqADiTAm0makIo81n42xFQ6WSCp/n+ avUQYG9l7Am7fk4N/wsFXUVfpfggXKpu7Ox0hYASHHLdEl1zhMtmEi2aPeqDoQ3dWsHx+3dN6gMM4 Q7albZcs8y56rTYCqfZS6c27+paA2yPCUVzbT/xPX7lM3VU3I5suARwt/RFVpB+dcNVvXC3kj0BAz 7+fVvGDCLCDFQtY/+3XjoFlSkEtkvk0QNLeqg/UuBcRCNfsAVK8xsF+lx4SHksqJiwtua6OcHSmyR GylNr45CnQJkzsGp/ZSkujmfVpK0XlA3apW5R6IMxU7kkKMS5ba63VI5ivgKYxZhfdJMEdTgsHO0h xr5CwvEur2zuZsSW0nxPb01s; Received: from muradm by localhost with local (Exim 4.95) (envelope-from ) id 1o1P9p-0004Ow-L1 for 49969@debbugs.gnu.org; Wed, 15 Jun 2022 12:17:49 +0300 From: muradm Date: Wed, 15 Jun 2022 12:17:40 +0300 Message-Id: <20220615091742.16880-7-mail@muradm.net> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615091742.16880-1-mail@muradm.net> References: <20220615091742.16880-1-mail@muradm.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655285209; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=po1J4ShuM0sOY+4h1QcvWtZw4wM1NBH6QqFVX7ESczI=; b=bb82mUn/OXOlAvHY9IjGOUnG3H6mrp9JIWhfm9krbahPgtvvVi43M7i/uRbj4ca8uAlncI Bswqtr7TPT/fUuWt4GALcpebJIggOuvPNXo8Ld9GAFIU5qdOSQATYnqYaAGkYJrVqbV4AM k1B/J1PVtsjw4YKUFLfHTyki4Ywcq0JE3QXioYFpYwRbTcohekyJ6kPT/252RRflzJ01Pq 1fZ1spD5Ss2u5gSEG8p0AsqjVWosaIySCQLi7dNVxIo0C9C4qRQKLb+tqcJEBB1U2ZaMtn 7Fq/ezpJYlE4cEDfMNxkk043HUWvZfqlpBq7eIAOXgSodN4DUVg9qwcksS2D6Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655285209; a=rsa-sha256; cv=none; b=jem3439XGWhnESaD6UnRRhMLoYPuhSqI9ra5MEuABNYgvqA8pIIYz1aSLjXZWk5OgqU0ko IJ1CVPPhHN8XTNv6VOPvDItmpwOKGPmK+Zf6RZPLBxI9hj/HmvIp5wYDSlVfwaAG3ISzn2 qd2cTHdZgJwg2Il2ADf7L4N9WUYiSOpSaUot7yB9a7Z6ixX0rAcTKG5VjiKauzyflESyPm tcIVHIEhsY6jqwmPYFAXY5iEKDbG3OaRbfpOLExHop0hCAzqD0B+ofUO2nUWLm7KVE/OoU akXktJ7HFShCLFne6PcfEEtHMltqEEIEvr5IMTnRfdyVkRuKvmDhV2re80StJg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=muradm.net header.s=mail header.b=q8oqcqF6; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 2.01 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=muradm.net header.s=mail header.b=q8oqcqF6; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: A94852B442 X-Spam-Score: 2.01 X-Migadu-Scanner: scn1.migadu.com X-TUID: GJ7jUdYGEHgJ * gnu/packages/admin.scm (libseat): New variable * gnu/packages/admin.scm (seatd): New variable * gnu/packages/freedesktop.scm (seatd): Remove variable * gnu/packages/wm.scm (wlroots): Replace seatd input with libseat --- gnu/packages/admin.scm | 53 ++++++++++++++++++++++++++++++++++++ gnu/packages/freedesktop.scm | 29 -------------------- gnu/packages/wm.scm | 4 ++- 3 files changed, 56 insertions(+), 30 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d6e1d819ab..eb6450b4da 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 muradm +;;; Copyright © 2021 pineapples ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Artyom V. Poptsov ;;; Copyright © 2022 Wamm K. D. @@ -104,6 +105,7 @@ (define-module (gnu packages admin) #:use-module (gnu packages elf) #:use-module (gnu packages file) #:use-module (gnu packages flex) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -5097,3 +5099,54 @@ (define-public greetd-pam-mount greetd-pam-mount is used in configuration of greetd to provide auto-(mounting/unmounting) of XDG_RUNTIME_DIR in the way that it will not interfere with default pam-mount configuration."))) + +(define-public libseat + (package + (name "libseat") + (version "0.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~kennylevinsen/seatd") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10f8387yy5as547xjjhl0cna6iywdgjmw0iq2nvcs8q6vlpnik4v")))) + (build-system meson-build-system) + (arguments + `(#:configure-flags '("-Dlibseat-logind=elogind" + "-Dserver=disabled"))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (propagated-inputs + `(("elogind" ,elogind))) + (home-page "https://sr.ht/~kennylevinsen/seatd") + (synopsis "Seat management library") + (description + "This package provides a universal seat management library that +allows applications to use whatever seat management is available.") + (license license:expat))) + +(define-public seatd + (package + (inherit libseat) + (name "seatd") + (arguments + `(#:configure-flags '("-Dlibseat-logind=elogind") + #:phases + (modify-phases %standard-phases + (add-after 'install 'remove-libs + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion (assoc-ref outputs "out") + (for-each delete-file-recursively '("lib" "include")))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc))) + (inputs '()) + (synopsis "Seat management daemon") + (description + "This package provides a minimal seat management daemon whose task is to +mediate access to shared devices, such as graphics and input, for applications +that require it.") + (license license:expat))) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index fc2c45c1f1..309876867a 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -849,35 +849,6 @@ (define (source-file regexp) with localed. This package is extracted from the broader systemd package.") (license license:lgpl2.1+))) -(define-public seatd - (package - (name "seatd") - (version "0.5.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~kennylevinsen/seatd") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1kglq8v4rnr3415mfaghyv2s2f8mxsy5s881gmm2908ig4n4j297")))) - (build-system meson-build-system) - (arguments - `(#:configure-flags '("-Dlogind=enabled"))) - (native-inputs - (list pkg-config scdoc)) - (propagated-inputs - (list elogind)) - (home-page "https://sr.ht/~kennylevinsen/seatd") - (synopsis "Seat management daemon and library") - (description - "This package provides a minimal seat management daemon whose task is to -mediate access to shared devices, such as graphics and input, for applications -that require it. It also provides a universal seat management library that -allows applications to use whatever seat management is available.") - (license license:expat))) - (define-public packagekit (package (name "packagekit") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 123e6ca7e7..24d95ba86c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -54,6 +54,7 @@ ;;; Copyright © 2022 Daniel Meißner ;;; Copyright © 2022 Pier-Hugues Pellerin ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 muradm ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,6 +89,7 @@ (define-module (gnu packages wm) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages bash) + #:use-module (gnu packages admin) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) @@ -1537,7 +1539,7 @@ (define-public wlroots libxkbcommon mesa pixman - seatd + libseat wayland wayland-protocols xcb-util-errors -- 2.36.1