From patchwork Tue Nov 23 20:25:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josselin Poiret X-Patchwork-Id: 34775 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 8FD7627BBEA; Tue, 23 Nov 2021 20:26:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 06ADF27BBE9 for ; Tue, 23 Nov 2021 20:26:16 +0000 (GMT) Received: from localhost ([::1]:44012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mpcMp-000664-55 for patchwork@mira.cbaines.net; Tue, 23 Nov 2021 15:26:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpcMd-00065v-3m for guix-patches@gnu.org; Tue, 23 Nov 2021 15:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40792) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mpcMc-00025P-Ju for guix-patches@gnu.org; Tue, 23 Nov 2021 15:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mpcMc-0004rZ-Dp for guix-patches@gnu.org; Tue, 23 Nov 2021 15:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52065] [PATCH core-updates-frozen] gnu: gdm: Pass GDK_PIXBUF_MODULE_FILE to sessions. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Nov 2021 20:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52065 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52065@debbugs.gnu.org Cc: Josselin Poiret X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163769912718639 (code B ref -1); Tue, 23 Nov 2021 20:26:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Nov 2021 20:25:27 +0000 Received: from localhost ([127.0.0.1]:52338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpcM3-0004qZ-41 for submit@debbugs.gnu.org; Tue, 23 Nov 2021 15:25:27 -0500 Received: from lists.gnu.org ([209.51.188.17]:45612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mpcLz-0004qQ-Ps for submit@debbugs.gnu.org; Tue, 23 Nov 2021 15:25:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpcLz-000613-EL for guix-patches@gnu.org; Tue, 23 Nov 2021 15:25:23 -0500 Received: from jpoiret.xyz ([206.189.101.64]:33044) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mpcLx-000206-PJ for guix-patches@gnu.org; Tue, 23 Nov 2021 15:25:23 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 07500184BF8; Tue, 23 Nov 2021 20:25:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1637699119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hAIgmaqerfBp0IbXx0LQFA8u9lJoaMJjdDQ5jGBMdJw=; b=uxS/AEgHp+9PbJva5NpcmVf/ILbdrpQfA6Bi96CBrSXhV5F+iXYGY200I/5DkKFoa5vDAn zoN+rNmHYCHSyDih6jV1FC8PZ1Gd2MGUiOn1314SYblyC0dqU016e1QpUHUwN9czo+8vbv 7TtA0+gWWujdGzIetcm09cv0OUT33kcz3ppYzCnAZWy4BVx9uXuFpOeTZYc11idnONLrLO xKokTH+NXw6mWCret+eQHKzXfxKSFSwbnr1Uj4l1vOMT4VZSzHxnkCqAaSznfuB5BkboUI QbfFMZzQ+4Pb6CX8j94RsKGE0JY/jl39VcKmO90Eq6fPHf/Tbm7GM6xRlWTlPQ== Date: Tue, 23 Nov 2021 20:25:10 +0000 Message-Id: <20211123202510.14090-1-dev@jpoiret.xyz> MIME-Version: 1.0 X-Spamd-Bar: ++++ Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: 0 X-Spam_score: -0.1 X-Spam_bar: / X-Spam_report: (-0.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, FROM_SUSPICIOUS_NTLD=0.001, FROM_SUSPICIOUS_NTLD_FP=1.997, PDS_OTHER_BAD_TLD=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches X-Patchwork-Original-From: Josselin Poiret via Guix-patches via From: Josselin Poiret X-getmail-retrieved-from-mailbox: Patches Hello, This patch should fix GDM not showing svg icons, most notably the peek password one on the login prompt. Best, Josselin -- >8 -- * gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch: Add patch. * gnu/local.mk (dist_patch_DATA): List it. * gnu/packages/gnome.scm (gdm): Use it. * gnu/services/xorg.scm (gdm-shepherd-service): Pass GDK_PIXBUF_MODULE_FILE. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 3 ++- .../gdm-pass-gdk-pixbuf-loader-env.patch | 24 +++++++++++++++++++ gnu/services/xorg.scm | 4 ++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch diff --git a/gnu/local.mk b/gnu/local.mk index 351c81bb3a..fe86c635c1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1114,6 +1114,7 @@ dist_patch_DATA = \ %D%/packages/patches/gdm-elogind-support.patch \ %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \ %D%/packages/patches/gdm-wayland-session-wrapper-from-env.patch \ + %D%/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch \ %D%/packages/patches/genimage-mke2fs-test.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 40f49a44db..6d56d04915 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8367,7 +8367,8 @@ (define-public gdm "gdm-default-session.patch" "gdm-elogind-support.patch" "gdm-remove-hardcoded-xwayland-path.patch" - "gdm-wayland-session-wrapper-from-env.patch")))) + "gdm-wayland-session-wrapper-from-env.patch" + "gdm-pass-gdk-pixbuf-loader-env.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch b/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch new file mode 100644 index 0000000000..4341e3fc30 --- /dev/null +++ b/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch @@ -0,0 +1,24 @@ +From 444250fce55f916af993bc855930c6809686e4bd Mon Sep 17 00:00:00 2001 +From: Josselin Poiret +Date: Tue, 23 Nov 2021 18:39:39 +0000 +Subject: [PATCH] Make GDM pass GDK_PIXBUF_MODULE_FILE to sessions + +--- + daemon/gdm-launch-environment.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c +index 14ecfac2..3e618321 100644 +--- a/daemon/gdm-launch-environment.c ++++ b/daemon/gdm-launch-environment.c +@@ -158,6 +158,7 @@ build_launch_environment (GdmLaunchEnvironment *launch_environment, + "WINDOWPATH", + "XCURSOR_PATH", + "XDG_CONFIG_DIRS", ++ "GDK_PIXBUF_MODULE_FILE", + NULL + }; + char *system_data_dirs; +-- +2.33.1 + diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 0735d777bd..3abee8694a 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -1004,6 +1004,10 @@ (define (gdm-shepherd-service config) ;; cursors. gdm doesn't login so doesn't source ;; the corresponding line in /etc/profile. "XCURSOR_PATH=/run/current-system/profile/share/icons" + (string-append + "GDK_PIXBUF_MODULE_FILE=" + #$gnome-shell + "/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache") (string-append "GDM_WAYLAND_SESSION=" #$(gdm-configuration-wayland-session config))))))