From patchwork Sun Feb 9 07:16:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 38426 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 5886927BBE2; Sun, 9 Feb 2025 07:17:19 +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=-8.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_SBL_A 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 26A5B27BBE2 for ; Sun, 9 Feb 2025 07:17:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1th1Yv-0006DH-JM; Sun, 09 Feb 2025 02:17:05 -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 1th1Yt-0006CC-1Q for guix-patches@gnu.org; Sun, 09 Feb 2025 02:17:03 -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 1th1Ys-0003jT-MY for guix-patches@gnu.org; Sun, 09 Feb 2025 02:17:02 -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:Subject; bh=/2Nzsf/FEtcr7zWDlLhj1sXHwZi/lQDT/3F5AjksLsI=; b=fu+d8mZli+YZTTOsBjcZd3XuQtSykWWu2tbR/99AqVH2Icw+GFrNQf1b3mZ1hScfnrLYThOhm8Cn07EQFhRKBwhmWNbnAtleelgOXDmwKQxmAeWub+TdEqxX2UtWAJckcpHn1rpgP/TGPbAsNJiMGVLDZqZmIsXL96rKiNPNjtWB347c3gPrZrZ0zEoGKrqkE0QRNhJj6H4kOseajReApTW7/Ug8bjGCMQBfsk1oaDXlPUZkNNPlvyHV06bq35oqRbFoeDqZJDXqblo7ayjsu8+D609TdxcYITdI3HDbOT1zJrPUC5r5CYsJXg5CDolKPz66ezcMCPHwNXH65uJ0wQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1th1Ys-0006Za-FJ for guix-patches@gnu.org; Sun, 09 Feb 2025 02:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76153] [PATCH] gnu: icewm: iAdd icewm.desktop file. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 07:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76153 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76153@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173908540425232 (code B ref -1); Sun, 09 Feb 2025 07:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Feb 2025 07:16:44 +0000 Received: from localhost ([127.0.0.1]:42793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1th1YZ-0006Yt-H6 for submit@debbugs.gnu.org; Sun, 09 Feb 2025 02:16:43 -0500 Received: from lists.gnu.org ([2001:470:142::17]:40346) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1th1YX-0006Yc-Dy for submit@debbugs.gnu.org; Sun, 09 Feb 2025 02:16:42 -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 1th1YR-00062L-LF for guix-patches@gnu.org; Sun, 09 Feb 2025 02:16:35 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1th1YP-0003hD-DM for guix-patches@gnu.org; Sun, 09 Feb 2025 02:16:35 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-21f53ad05a0so31212315ad.3 for ; Sat, 08 Feb 2025 23:16:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739085391; x=1739690191; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=/2Nzsf/FEtcr7zWDlLhj1sXHwZi/lQDT/3F5AjksLsI=; b=H26mWJMV0CzUPsao5WPFW/VHmB1ixDkXYI/Et1lpu3MrkKZI3y7hfXdFIqbjQPN04+ YVEoUL3qhKzY39ABrQjGRmXbMRDjJaVzXXSFZAyxn9MsLi65wlesbBZjeboFFkENb4oo gT3wqUF5cZg9WV+Y9HIYx6SarEb5PRxqVnXPsosusBrbXBhe5fxoWLOkW7ye6UnuXbE6 PbftE01u8Z+iyLYpsso44uc2fq1DisaSrKH1PkAZJR3xccHC7KJNev010ADDsqD7cU73 diqfpS+vAY3Ca2bST+bJd9KbVIAYhHXozQ0vdj/cZRbAYd8SG+z+Uv7tSqf94TZbZxzc Z8OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739085391; x=1739690191; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/2Nzsf/FEtcr7zWDlLhj1sXHwZi/lQDT/3F5AjksLsI=; b=pdKmXkj3qCKVQLo4MEKV9XfcvplSjp4maqLTY70kRf9WWhChKwr7VOzEbD3t9Vfi49 g4tp0XwEKA6aVaVbIG5HygERzZC53cvu40zE7Zycg/0fuQVynkwt25ShB4QiOyWwGLef jGeBFlE8PkXJkfVqSXtkK8Pv0+uqk2ltn5L1nLstB7nLTN8aje+z0J330ia6uUVKH0JO PULQs4RJFcgh3or/pHH2Is1LWJkCjJSNXIsYFhVAslWDJ2dftsO1T/m3UMRBwcomMfTZ wkXgg0Fqr0tk+Km0PFjpebtbMywfPavAc/vluMuW0iBEz0iY3cQZcz/iLXP8F6GaodvG OI1g== X-Gm-Message-State: AOJu0YzVCab7R9WA+l/uD+Dan5d18KPdXBUv1DGxfZ8KIk6/ujvgobCa hDRpniK0aeVCpyO6Gz65g4Q/6+olq6eP9QdFiOZIUXqwqF+wLoVcQvS5DQ== X-Gm-Gg: ASbGncswObUdjcw2r4jxYJFpcmk03xuxWZeDivz/kLwIuW0XYn9eb8naAaDuAS97JTy 3Ls58zuWlS3DE58Kec8tYU0RqXvc8WxrUiSp0jj/iM7nsGwAQSWIfGYOJR5O/cHmtJWafI0+8VH 1n5VyGMascgGojigJUuO3AVudPMua8Tx9ayq5WzA6JEkYyPRb/Idk7G3mlRX1kpzY/6blmv2hZq t3aLjmHGjhbq5FuDiCpaMAeoLt4C8NWqEOrgyONqqCzvvbSpDEGeRa/vVCmIWTQcoQndcI1yzRq 3tONddDexizb43eFRg== X-Google-Smtp-Source: AGHT+IGTUc2zN2wiBpGV7a0YMHcH2IhgWUmvR8Q2gKXlv+FWZIUzI2TNvmGwZum3CgTfTGTvvfVJaw== X-Received: by 2002:a05:6a21:170f:b0:1e0:c56f:7daf with SMTP id adf61e73a8af0-1ee03a21dddmr16836310637.6.1739085390888; Sat, 08 Feb 2025 23:16:30 -0800 (PST) Received: from localhost.localdomain ([38.84.157.61]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-ad5498dac9asm746826a12.66.2025.02.08.23.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 23:16:30 -0800 (PST) From: Andy Tai Date: Sat, 8 Feb 2025 23:16:24 -0800 Message-ID: <9a98aea8a4ba530cc59d35f16c989bb298c2c913.1739085365.git.atai@atai.org> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=lichengtai@gmail.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.07, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 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 * gnu/packages/wm.scm (icewm): Add 'install-xsession phase that installs the icewm.desktop.file. Change-Id: I94661ec15bccc3bcb1539a52c78cc303a4b5caf3 --- gnu/packages/wm.scm | 55 ++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 18 deletions(-) base-commit: fd3876ec2a47909eac8e7fa0f24710a94ccb1459 diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 8aa314e56b..7ce4bb9f34 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1027,19 +1027,19 @@ (define-public icewm (package (name "icewm") (version "3.6.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/ice-wm/icewm/releases/download/" - version "/icewm-" version ".tar.lz")) - (sha256 - (base32 - "0xmw4ilzsc932fxqahxvqix66x940nzf54p5mz5p67rplg9sz7wp")))) + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/ice-wm/icewm/releases/download/" version + "/icewm-" version ".tar.lz")) + (sha256 + (base32 "0xmw4ilzsc932fxqahxvqix66x940nzf54p5mz5p67rplg9sz7wp")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) (inputs (list fontconfig fribidi - glib ;for icewm-menu-fdo + glib ;for icewm-menu-fdo imlib2 libice libjpeg-turbo @@ -1057,15 +1057,34 @@ (define-public icewm lzip perl)) (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'skip-failing-test - ;; strtest.cc tests failing due to $HOME and /etc setup - ;; difference under guix - (lambda _ - (substitute* "src/Makefile.in" - (("TESTS = strtest\\$\\(EXEEXT\\)") - "TESTS = "))))))) + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'skip-failing-test + ;; strtest.cc tests failing due to $HOME and /etc setup + ;; difference under guix + (lambda _ + (substitute* "src/Makefile.in" + (("TESTS = strtest\\$\\(EXEEXT\\)") + "TESTS = ")))) + (add-after 'install 'install-xsession + (lambda* (#:key outputs #:allow-other-keys) + ;; Add a .desktop file to xsessions. + (let* ((output (assoc-ref outputs "out")) + (xsessions (string-append output + "/share/xsessions"))) + (mkdir-p xsessions) + (call-with-output-file (string-append xsessions + + "/icewm.desktop") + (lambda (port) + (format port + "[Desktop Entry]~@ + Name=icewm~@ + Comment=IceWM window manager~@ + Exec=~a/bin/icewm~@ + TryExec=~@*~a/bin/icewm~@ + Type=Application~%" + output))))))))) (home-page "https://ice-wm.org/") (synopsis "Window manager for the X Window System") (description