From patchwork Fri Mar 18 07:38:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37919 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 079F827BBEA; Fri, 18 Mar 2022 07:40:37 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 B86FC27BBE9 for ; Fri, 18 Mar 2022 07:40:36 +0000 (GMT) Received: from localhost ([::1]:47762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nV7Dv-0004N0-Sy for patchwork@mira.cbaines.net; Fri, 18 Mar 2022 03:40:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nV7DS-0003R4-6O for guix-patches@gnu.org; Fri, 18 Mar 2022 03:40:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34049) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nV7DR-0004Jq-UL for guix-patches@gnu.org; Fri, 18 Mar 2022 03:40:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nV7DR-0007jJ-SX for guix-patches@gnu.org; Fri, 18 Mar 2022 03:40:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54434] [PATCH v2 7/7] gnu: xfce4-session: Load user panel plugins. Resent-From: 'Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Mar 2022 07:40:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54434 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54434@debbugs.gnu.org Cc: Maxime Devos , Brendan Tildesley Received: via spool by 54434-submit@debbugs.gnu.org id=B54434.164758917429617 (code B ref 54434); Fri, 18 Mar 2022 07:40:05 +0000 Received: (at 54434) by debbugs.gnu.org; 18 Mar 2022 07:39:34 +0000 Received: from localhost ([127.0.0.1]:56172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV7Cw-0007hd-H2 for submit@debbugs.gnu.org; Fri, 18 Mar 2022 03:39:34 -0400 Received: from mout-p-202.mailbox.org ([80.241.56.172]:49946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nV7Cu-0007h6-LR for 54434@debbugs.gnu.org; Fri, 18 Mar 2022 03:39:33 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4KKbW26GJSz9sTj; Fri, 18 Mar 2022 08:39:26 +0100 (CET) From: 'Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1647589164; 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: in-reply-to:in-reply-to:references:references; bh=9cHxV65RQzkTlfHTK9i3UrsA/IRqr21VOB1ZTHIh9ws=; b=vkOpTxftt5O34JawpElWDScWp8cOwnz+8OhFyci907cwuGsWomolwjDnvDrDsEVjMpbqkR /XyJCdLB72n2JADYzU/eQu9YgkGUr0waFdx9UAO24L6y7dLKgbqpDCnz2y1uwLj9gz6GFn XTeEmpYxKHdXEm2JkcT+rYS8ufMvZ2UsWy6xIZ8fFunC8gnCtUVYBsQA9zMkp00sPAKt+W xEcMsIWk/42qc/bDkKshY7jTKvQKdCdi7U947YL8x+lB010wsaEHXvS58ADUY+Ws1DXnhy tCzJ5tFT5mrcNWDWxj6T2PnoGZTAF56wJcf2t9zEP1e06iD+sDtPLhK+Mz6cnQ== Date: Fri, 18 Mar 2022 18:38:44 +1100 Message-Id: <20220318073844.14290-8-mail@brendan.scot> In-Reply-To: <20220318073844.14290-1-mail@brendan.scot> References: <20220318073844.14290-1-mail@brendan.scot> MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches From: Brendan Tildesley gnu/packages/xfce.scm (xfce4-session): [patches]: Add a patch to make use of X_XFCE4_LIB_DIRS and load user installed panel plugins. This is needed, because xfce is launched from /run/current-system/.... It will not otherwise load panel plugin .so's from the users home guix profile. gnu/packages/patches/xfce4-session-startxfce-load-user-plugins.patch: New file. gnu/local.mk: Reference patch file. --- gnu/local.mk | 1 + ...-session-startxfce-load-user-plugins.patch | 20 +++++++++++++++++++ gnu/packages/xfce.scm | 3 ++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/xfce4-session-startxfce-load-user-plugins.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2911541275..4d968162ff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1956,6 +1956,7 @@ dist_patch_DATA = \ %D%/packages/patches/xf86-video-tga-remove-mibstore.patch \ %D%/packages/patches/xf86-video-voodoo-pcitag.patch \ %D%/packages/patches/xfce4-panel-plugins.patch \ + %D%/packages/patches/xfce4-session-startxfce-load-user-plugins.patch \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xgboost-use-system-dmlc-core.patch \ %D%/packages/patches/xmonad-dynamic-linking.patch \ diff --git a/gnu/packages/patches/xfce4-session-startxfce-load-user-plugins.patch b/gnu/packages/patches/xfce4-session-startxfce-load-user-plugins.patch new file mode 100644 index 0000000000..f6f1bbc9b1 --- /dev/null +++ b/gnu/packages/patches/xfce4-session-startxfce-load-user-plugins.patch @@ -0,0 +1,20 @@ +From a1c94934d211d69f9a2cdf03d64327bcd7cccb41 Mon Sep 17 00:00:00 2001 +From: Brendan Tildesley +Date: Thu, 17 Mar 2022 19:49:12 +1100 +Subject: [PATCH] startxfce4: load plugins from user profile + +--- +diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in +--- a/scripts/startxfce4.in ++++ b/scripts/startxfce4.in +@@ -101,6 +101,8 @@ else + prog=/bin/sh + fi + ++ export X_XFCE4_LIB_DIRS="${GUIX_PROFILE:-$HOME/.guix-profile}/lib/xfce4/${X_XFCE4_LIB_DIRS:+:}$X_XFCE4_LIB_DIRS" ++ + if [ -f "$HOME/.xserverrc" ]; then + SERVERRC="$HOME/.xserverrc $SERVERRC" + elif [ -f /etc/X11/xinit/xserverrc ]; then + + diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c36749c6a4..781046a968 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -658,7 +658,8 @@ (define-public xfce4-session (("/sbin/shutdown -r now") "restart") (("/usr/sbin/pm-suspend") "pm-suspend") (("/usr/sbin/pm-hibernate") "pm-hibernate")) - #t)))) + #t)) + (patches (search-patches "xfce4-session-startxfce-load-user-plugins.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags