From patchwork Sun Feb 9 07:20:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 38427 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 DD46E27BBEA; Sun, 9 Feb 2025 07:21:11 +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=ham 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 2166A27BBE2 for ; Sun, 9 Feb 2025 07:21:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1th1cm-0007q3-NC; Sun, 09 Feb 2025 02:21:04 -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 1th1ck-0007pn-VC for guix-patches@gnu.org; Sun, 09 Feb 2025 02:21:02 -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 1th1ck-0004MA-MI for guix-patches@gnu.org; Sun, 09 Feb 2025 02:21: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:In-Reply-To:References:Subject; bh=/2Nzsf/FEtcr7zWDlLhj1sXHwZi/lQDT/3F5AjksLsI=; b=ClgdCTimgvhytQ5O3rPlWBvpIU9i1azP/bHORmP7VfI9mmqlVolU10OoA8ZCGxVxoXxc0g61KcFS3wtsR+VlFr2Va4z7a2yp0BHt9xm6JIymOdOn6OpF756PpUj4SPRR7+j8m8NBfCP+40PZm0Ns9bl8N2mZqyWHgY75A2gvoeqEkAGP13oGhvhShaE+W5uLNfaJXI3Ahm7I25z7LhbbpwWEghtCwpPS8X64qzFuVpx0VryaTdJeK/U1ubGschtVgI5cqw5ulhBx9s1ca+UfQEKCklg4/N4OjM2gde/VdJykAc4/m3Rve3XVxmOcevDXrXyIQONpFdWMiE4WKLUmJA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1th1ck-0006nO-Hd for guix-patches@gnu.org; Sun, 09 Feb 2025 02:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76153] [PATCH v2] gnu: icewm: Add icewm.desktop file. References: <9a98aea8a4ba530cc59d35f16c989bb298c2c913.1739085365.git.atai@atai.org> In-Reply-To: <9a98aea8a4ba530cc59d35f16c989bb298c2c913.1739085365.git.atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Feb 2025 07:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76153 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76153@debbugs.gnu.org Cc: Andy Tai Received: via spool by 76153-submit@debbugs.gnu.org id=B76153.173908563626072 (code B ref 76153); Sun, 09 Feb 2025 07:21:02 +0000 Received: (at 76153) by debbugs.gnu.org; 9 Feb 2025 07:20:36 +0000 Received: from localhost ([127.0.0.1]:42812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1th1cJ-0006mR-VS for submit@debbugs.gnu.org; Sun, 09 Feb 2025 02:20:36 -0500 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:48557) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1th1cG-0006m9-Ky for 76153@debbugs.gnu.org; Sun, 09 Feb 2025 02:20:33 -0500 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-2f9bd7c480eso6251164a91.1 for <76153@debbugs.gnu.org>; Sat, 08 Feb 2025 23:20:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739085626; x=1739690426; darn=debbugs.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=ll/oyg1Eo4WLB0ctfKN78EzzC/BFMPkDrg9hSHBIU8DU0e2x5FS9ezAunSThd4W5Zr pqtavXbexFLwRX1hf696bMm8R5iPk0P/82jSe65ri0W0c/7qz0gvK/A2SeLKw/c3T13o cbF+m1AI5tDC6QNnO+9xrhOoEV73VwZFION+5LCvAROcqWAUsIwfcKcNF54wC2siM8i0 XcHAomkWk8VbpUWbgb7/Qv+pqZzolyYsqW7jk/uh/HbW2a2eadEa3Ze2u0QZ6oNkOxZn +asj67L100FLRgdFE4A0hwUnvMUwtFGU1Hn0mymHqSC5OXJ51NsBAt344/Ye+vgKAZDf e3bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739085626; x=1739690426; 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=LunAFUw8ekquv51clySyNovQgRYNCPMiUV4GsRu4B+ecg6jiQfsolJ/ZS9Jiti9rdb vJUN/FfygqiMsWpCDKH359cPE3GFXnwHYduuMqXviAigOYCQDQBd1HD6X0xTTNH4eqjB 6Y0+5lNAdvKw33hrJekH+J/euV446jYj0de3Ly7ONnglqg2PGB3DqMgJfT0w6DMfsd4h 0U6fcLk8QQDRcD2QJuIkScyzqwKP8wghDygLxggfb9o/fpYsBMc6fCaUoKRewp5SqcgG vivc1X+1lh4GWaWEQpDko77OceWj95U8LraruYCHTo4L1Krgt7syUqB7VJ7dYGYXhxso 2HcQ== X-Gm-Message-State: AOJu0Yzza5v1+IlxjUp04sIkvXr2bz9l5WKGtbC9xuUScQkhgOpz27gf vj4kIVA46vBcsYXcQ0fYSCAHZo+xU42KIH2D7UFIrwfQYkwNMFnV6EXqwQ== X-Gm-Gg: ASbGncv3Q/zjdxhu6shYVtKND+MOIkqmpxA7KRUSFbUFSoQXfp7O6DUCzXpKiR1uzuU 2l54GmvBmC+4tpuJY9O8EN23eRMkN+Zbyp6tBLucJOtMtaureuwMjEk2ZyK3cQd7hxNjunCQ7U/ FlQszdEJ7WMdMpX2H3beBookeaoxqyWMqgH+Zc8WF7csBsrT5pimM+UzCC7R4B7O7ItwCBA+gsO H6UhpGx5CNy0TGEIIwdGXCX1iZpl7yDrVxhC/rF+aHkMtvseOoJ5YrwGzLVzihExS/M1yGjZ425 vp+bq8BDZ26Tlc9F2w== X-Google-Smtp-Source: AGHT+IGvYC+oejv+cL1w1SHjVh7QTtkv3CO09NKmqyPOPKTdzOvhPSZdKOWMQCX4dOlvymI5KLxbeQ== X-Received: by 2002:a17:90b:3d03:b0:2ea:bf1c:1e3a with SMTP id 98e67ed59e1d1-2fa24069ec6mr17219578a91.12.1739085626110; Sat, 08 Feb 2025 23:20:26 -0800 (PST) Received: from localhost.localdomain ([38.84.157.61]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2fa2716c1ecsm4371005a91.25.2025.02.08.23.20.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Feb 2025 23:20:25 -0800 (PST) From: Andy Tai Date: Sat, 8 Feb 2025 23:20:21 -0800 Message-ID: <97224d956e711613b54fbcffed781a5d503a63e2.1739085587.git.atai@atai.org> X-Mailer: git-send-email 2.46.0 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-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