From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id gHWCD67pcWc/RAAAqHPOHw:P1 (envelope-from ) for ; Mon, 30 Dec 2024 00:30:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id gHWCD67pcWc/RAAAqHPOHw (envelope-from ) for ; Mon, 30 Dec 2024 01:30:38 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=BqNA8WUZ; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=idhHu9mR; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=163.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735518638; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=BBiL873BXMGbCREz8LIvBa4sV2avNxG8si/J7z1xau4=; b=mhmyTiUGPg9U1jmrMFI+XnqFBR3LbgaBQBMU1dlCtrCBsXOLM18KfLgVFhlXeUDCjfYIFt jK+/x9WRry/TeV+1sSVGy1ccXiC7WYDXOhMAOb0Gv/UH4kcOq9n7WHIkdPc+gV+B7FpyyM X9Mmo3ojSvqktrhuR3kIIhw80XvpOQr/+7He3W+dUtXYIX3vEtf4SLDWQ+MoIu2O1jeeUy x5efGmWNcRrnSom7Ri0rVSb5MUAiJMzkX3QcnSThPcaT6coFBqtkwDV3t1tJIY5LSgxTOF bp/2MOQpVKBhcJCXomwDMJEEWzGWdR+bEv5uQMu9nqVVc9WGKaCwllTQl13Xow== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=BqNA8WUZ; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=idhHu9mR; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=163.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735518638; a=rsa-sha256; cv=none; b=jdvMKnFY18CkSgFhyVf1Ob/FCYjjewosEsUv4/al+9aP74p+YPkVBt3kpFAOTeV9CjEedd nCJYkDt2kHo5wod6NpN1XyCG1OqfGyRTurc1x/JT+pdJ2+5Ey6rzwInAQB5VIuHm01p8Zl q5a3s/6603rHZDzy5jbpNP0QdTSl5CKr3KodhQdGNRLw16RbZLxjN9fdCcle0BOG6xuS9S 30AfZXIIJqa+P/vCEnwCAiTqg6v4JoGFrfI26/kL5/8zpzE8vbNU7tB6BYK8GrMonUkbZo bfZCIGiB6NClkGakInGkgGdDHsJd1fVPPo55PNrG0j6Rthn77Fd0umKaESI8sA== 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 0A36B406ED for ; Mon, 30 Dec 2024 01:30:38 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tS3fm-0005Kn-Fi; Sun, 29 Dec 2024 19:30:19 -0500 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 1tS3fZ-0005GS-0h for guix-patches@gnu.org; Sun, 29 Dec 2024 19:30:05 -0500 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 1tS3fY-0006B8-Mb for guix-patches@gnu.org; Sun, 29 Dec 2024 19:30:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=BBiL873BXMGbCREz8LIvBa4sV2avNxG8si/J7z1xau4=; b=BqNA8WUZbhFaL1/CCiURXfak+4xMngJl7Ou0B7yqF0rS89gt+akApUi+B00whLSfoEiC5hIPMyXnSFhykrdOuPiMq794ER8Jh8dmMUhwbdDUFhRq3BUBWP3J0wYUfRM/W7IR1Mwk0NA3qARE0KmmeFsks6y2AGrKPK+If4u2Ui5sLBxeixtadPPRrMl3bezqlZ6oLL8pYq7kDZlK8OOAX3TgRlYVlYqOiLUCnQ0rvtRBA9+yQsAVfNO3aiRveG3Av+2gK10yX3OIntO4ea568gdFG95Y/SK3Yi585AkHxNZsrPgFc9CjaHe3OO9lRlxy6OW3nbqHLWymmPaOcToClw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tS3fW-00067p-Uu; Sun, 29 Dec 2024 19:30:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75043] [PATCH v5] gnu: Add slick-greeter. References: <87ldw6vj2v.fsf@163.com> In-Reply-To: <87ldw6vj2v.fsf@163.com> Resent-From: tumashu@163.com Original-Sender: "Debbugs-submit" Resent-CC: tumashu@163.com, tumashu@163.com, guix-patches@gnu.org Resent-Date: Mon, 30 Dec 2024 00:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75043@debbugs.gnu.org Cc: Feng Shu , Feng Shu , tumashu@163.com X-Debbugs-Original-Xcc: Feng Shu , tumashu@163.com Received: via spool by 75043-submit@debbugs.gnu.org id=B75043.173551856523475 (code B ref 75043); Mon, 30 Dec 2024 00:30:02 +0000 Received: (at 75043) by debbugs.gnu.org; 30 Dec 2024 00:29:25 +0000 Received: from localhost ([127.0.0.1]:56632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS3eu-00066X-NG for submit@debbugs.gnu.org; Sun, 29 Dec 2024 19:29:25 -0500 Received: from m16.mail.163.com ([117.135.210.3]:58290) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tS3eq-00066K-38 for 75043@debbugs.gnu.org; Sun, 29 Dec 2024 19:29:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=BBiL8 73BXMGbCREz8LIvBa4sV2avNxG8si/J7z1xau4=; b=idhHu9mRKf/XLw7mGAA8D dRG+tLMvyBOHG6NsMjnd8HQmr3r5PfpC0soUQ8kcjjDhE4+dz8ysVRVMrPzR21MV c5UmYLoLnpJyMVGHgK28aOQpgl+yN1MMuN64cH1QT0KN5nzLr0HQ8q/EtqwxvBQ+ dcNfNge5XsBr+dxrruEnpo= Received: from localhost.localdomain (unknown []) by gzsmtp4 (Coremail) with SMTP id PygvCgA33nNX6XFnavkjDA--.53572S2; Mon, 30 Dec 2024 08:29:12 +0800 (CST) From: tumashu@163.com Date: Mon, 30 Dec 2024 08:28:55 +0800 Message-ID: <20241230002858.3088-1-tumashu@163.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: PygvCgA33nNX6XFnavkjDA--.53572S2 X-Coremail-Antispam: 1Uf129KBjvJXoW3JrW7CryxCr4kJFWxAryxXwb_yoW7Cry8pa ySkFyrGr4DArn8XrWxWw4agw13Cas3tF4rtw13u34ayayYkrWUZFy7ta98Ar1xGw17A3yU Wr4UXw17AFyDZrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0JUoCJkUUUUU= X-Originating-IP: [218.92.14.78] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiRRbF1Gdx5GhlKgAAsX 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -1.67 X-Spam-Score: -1.67 X-Migadu-Queue-Id: 0A36B406ED X-TUID: 6wd4AVru0vhR From: Feng Shu * gnu/packages/display-managers.scm (slick-greeter): New variable. Change-Id: I9f117bd91bfe9edbd0619f434ad46399e3c59b99 --- gnu/packages/display-managers.scm | 106 ++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index b70f8101e6..16d0339701 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -39,6 +39,7 @@ (define-module (gnu packages display-managers) #:use-module (guix build-system qt) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system meson) #:use-module (guix build-system trivial) #:use-module (guix packages) #:use-module (guix utils) @@ -48,9 +49,11 @@ (define-module (gnu packages display-managers) #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages cinnamon) #:use-module (gnu packages crypto) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -59,6 +62,7 @@ (define-module (gnu packages display-managers) #:use-module (gnu packages guile) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -461,6 +465,108 @@ (define make-flags* display manager which supports different greeters.") (license license:gpl3+))) +(define-public slick-greeter + (package + (name "slick-greeter") + (version "2.0.8") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/linuxmint/slick-greeter") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pk8d8mpnrh70xdi9mfn1h5xkrf09v06vbi1p1wzqdskzfh3ci1n")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:configure-flags + #~(list + ;; Put the binary under /bin rather than /sbin, so that it gets + ;; wrapped by the glib-or-gtk-wrap phase. + (string-append "--sbindir=" #$output "/bin")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-hardcoded-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("src/slick-greeter.vala" + "src/session-list.vala" + "src/user-list.vala") + (("/usr/bin/numlockx") + (search-input-file inputs "/bin/numlockx")) + (("/usr/bin/slick-greeter-") + (string-append #$output "/bin/slick-greeter-")) + (("/usr/share/slick-greeter/badges/") + (string-append #$output "/share/slick-greeter/badges/")) + (("/usr/share/xsessions/") + "/run/current-system/profile/share/xsessions/") + (("/usr/share/wayland-sessions/") + "/run/current-system/profile/share/wayland-sessions/") + (("/usr/share/backgrounds/") + "/run/current-system/profile/share/backgrounds/")))) + (add-after 'glib-or-gtk-wrap 'custom-wrap + (lambda _ + (wrap-script (string-append #$output "/bin/slick-greeter") + ;; Wrap GDK_PIXBUF_MODULE_FILE, so that the SVG loader is + ;; available at all times even outside of profiles, such as + ;; when used in the lightdm-service-type. Otherwise, it + ;; wouldn't be able to display its own icons. + `("GDK_PIXBUF_MODULE_FILE" = + (,(string-append + #$output + "/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"))) + `("XDG_DATA_DIRS" ":" prefix + (,(string-append "/run/current-system/profile/share:" + (getenv "XDG_DATA_DIRS")))) + '("XCURSOR_PATH" ":" prefix + ("/run/current-system/profile/share/icons"))))) + (add-after 'install 'wrap-program + (lambda _ + (for-each + (lambda (prog) + (wrap-program (string-append #$output "/bin/" prog) + `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))) + '("slick-greeter-check-hidpi" + "slick-greeter-set-keyboard-layout" + "slick-greeter-enable-tap-to-click")))) + (add-after 'install 'fix-.desktop-file + (lambda _ + (substitute* (string-append + #$output + "/share/xgreeters/slick-greeter.desktop") + (("Exec=slick-greeter") + (string-append "Exec=" + (string-append + #$output "/bin/slick-greeter"))))))))) + (native-inputs + (list gettext-minimal + (list glib "bin") + pkg-config + vala)) + (inputs + (list dbus + gtk+ + guile-3.0 + libcanberra + libgnomekbd + libxapp + libxkbfile + lightdm + numlockx + pixman + python-pygobject + python-wrapper)) + (synopsis "A slick-looking LightDM greeter") + (home-page "https://github.com/linuxmint/slick-greeter") + (description "Slick-Greeter is a fork of Unity Greeter 16.04.2, it is +cross-distribution and work pretty much anywhere, it supports HiDPI, If a +default/chosen session isn't present on the system, it will scans for known +sessions dirs and replaces the invalid session choice with a valid session.") + (license license:gpl3))) + (define-public lightdm-gtk-greeter (package (name "lightdm-gtk-greeter") -- 2.45.2