From patchwork Sat Mar 22 08:22:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 40581 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 3961127BBEA; Sat, 22 Mar 2025 08:23:21 +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=-7.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED,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 6CCE627BBE2 for ; Sat, 22 Mar 2025 08:23:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvu8L-0005vJ-Ct; Sat, 22 Mar 2025 04:23:09 -0400 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 1tvu8G-0005uW-Me for guix-patches@gnu.org; Sat, 22 Mar 2025 04:23:04 -0400 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 1tvu8E-0002qM-UP for guix-patches@gnu.org; Sat, 22 Mar 2025 04:23:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=t0F2RAlULfd8v1/yXt/6BNYm6euBWdaMNd7GlmbLEv0=; b=j4mmOBDdD3hOLzu78w0hHmpLTe+wzx7W8mqeq+8sUrPqerrhMaAuYz3UmFvu9YxtANhbopnqRedw9zENL7F/bfCqS1YRPIGiz5Bs38++Ng59H+o5G3ZCoTpsV1dH0TZmudrsDdKEFPE/L3Vj3pdG7ZvYUIHLq1sG+wAF4NUF5QNY/33+aAHCnYXfMAZeW+s9CALsD5tXUAPNbClJ6WRu+IyQRA2vJUZoQ2tSB7N3o6WlWswvyCEX0PhtqdsZAX1bReFYUCtxJcZ1uvcvfNbSlPhnu1yx8brrNwud221tqPSBepD2B39oQQCKYYFRsWoLDqeoevVDlof/yL0fHaT0bQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvu8E-0004Pc-PS for guix-patches@gnu.org; Sat, 22 Mar 2025 04:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77146] [PATCH v2 2/2] gnu: icewm: Switch to git-fetch and use cmake-build-system. Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 08:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77146@debbugs.gnu.org, z572@z572.online Received: via spool by 77146-submit@debbugs.gnu.org id=B77146.174263177116910 (code B ref 77146); Sat, 22 Mar 2025 08:23:02 +0000 Received: (at 77146) by debbugs.gnu.org; 22 Mar 2025 08:22:51 +0000 Received: from localhost ([127.0.0.1]:40756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvu83-0004Oa-3D for submit@debbugs.gnu.org; Sat, 22 Mar 2025 04:22:51 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:54538) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tvu7w-0004Ny-NQ for 77146@debbugs.gnu.org; Sat, 22 Mar 2025 04:22:45 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2241053582dso24374525ad.1 for <77146@debbugs.gnu.org>; Sat, 22 Mar 2025 01:22:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742631758; x=1743236558; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=t0F2RAlULfd8v1/yXt/6BNYm6euBWdaMNd7GlmbLEv0=; b=fYdYrXvLXS4SIm5nudFNUMkZGyNHWgV3q1JpIf+GZSAumJMF5AdqSwhzF7Ccejy/us cUEKM2+w2ehUnFa0ltAVCahswwlnHhH2oW97wfkwaHCn/qsp57/rXQxunBYh0oqZfjDk GeOT4epWjVM+tpoP02HbJ+b1NKVRafUDbSWq8/4vZRyrJeigPVJNfeqAwWyBdiK7fvWN DF/7dm/jZovrdzjT0BEscns475qxvfe9K9n6gdzqTyO3jz3fK2Ci5v0/iJqJsL8eFxwO 9UkyHek2JuPI/bWkQkAwsyUnvinVN9vjdqW/Gc5MI2EtofOsEJFOJK9/S2UIhaMwgt7W Gg2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742631758; x=1743236558; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=t0F2RAlULfd8v1/yXt/6BNYm6euBWdaMNd7GlmbLEv0=; b=wQc4Xk37U2WGjQj5gobkgHJIcNhO4C9xnUzEcE2U6ZANDc84kSRgtV05WUZu2Rc38D VNx6kQ1T0PmV6d9Rog0rlBSYhEMoQOZ/No20Xp9EdsPzEty/MRx0cMk5R8Xcmmv3sma4 G1b+Mt0Duwj4py/ar5big6tVKVA788CeVPQor25Ks56o1pmm21HjrhXVKL+IHXs2BEKs DPTNeyf1sGy95GD9vxckPiT+1NyjSTZ63UMFHg9isBng9OqGe+rxMgDfn9HledlZtIy3 izrTeoe21+rbYdZ5Bkroyvsr0nZm4b4oTwVxOVKRt+EF7N134K4bX2e1ed9ObaYqfomn nLXQ== X-Gm-Message-State: AOJu0YzEil9PsIUQY0ft1CGRrB6aaKJp8EHyCRM244uGiE9rDVOLmuCr ECCqjAOcXLxOEm1E3Y4IfOdGoAGTg8dXcGa0FvNxgaCEqNfizb5/XXhHOg9504w= X-Gm-Gg: ASbGncvW5ZIUWX4KhqHRBIDP+CLHZPec90incYNh5XXKUlQe+V3yIJAByzKW5Yhpr1I zkTwYv3rpvs6DEpDkNxYPxedOahAZuXMchH1im5hEzMrZjRD3qTdExNNmuAvmiPlzD8x4IaY7f7 66hytL3LGobrgTl5fk9MOdBMbnR9sAAhB4ezRxL1iYJvtrG3bFrjPAdl3kpNRpNbB6eKMQYEQ3A N5/zYx4muL4Q2WvKgUsijgq87xjPOEUNs+Yoa5ScR+UTnjrHMtQ4fv8iV9Rv2wpPz/lVPBSzutn xznYPxm9vWCNVf25Vn1a3ZUrVBOGqspn1jLnIAadRNbTW5ZhcDxgNEkopCyiYg== X-Google-Smtp-Source: AGHT+IElC2kBCuAVLv+7goGZIY74Xnd9tK4lcLyx2St7S+K3nWhrHulirZDqZy2FE5dHA59aw4avgw== X-Received: by 2002:a05:6a00:b4a:b0:736:4cde:5c0e with SMTP id d2e1a72fcca58-7390597496cmr9343551b3a.10.1742631758231; Sat, 22 Mar 2025 01:22:38 -0700 (PDT) Received: from DEskMiniX300.taila8caa5.ts.net ([172.98.218.160]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73905fa4021sm3598316b3a.13.2025.03.22.01.22.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Mar 2025 01:22:37 -0700 (PDT) From: Andy Tai Date: Sat, 22 Mar 2025 01:22:31 -0700 Message-ID: <994f16a075aa6485b3c37412522c40c81b949e46.1742631604.git.atai@atai.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 From: Zheng Junjie * gnu/packages/wm.scm (icewm)[source]: Switch to git-fetch [build-system]: use cmake-build-system. [arguments]<#:phases>: Adjust skip-failing-test phase. Change-Id: I6c666962a01114831bbc73f3f3f9e22bcc38afc8 --- gnu/packages/wm.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 02ac353a9cc..1288d996027 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1030,14 +1030,15 @@ (define-public icewm (name "icewm") (version "3.7.2") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/ice-wm/icewm/releases/download/" - version "/icewm-" version ".tar.lz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ice-wm/icewm") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1n02y9i54b4xd0px6mfvwpvm2w796mg26iymsbq63xsjfcsqmvdl")))) - (build-system gnu-build-system) + "0zrj9ka9sglxchmkcgzdbjgzzzcfrfnk4ydhwzbi91vrrq7c6sh3")))) + (build-system cmake-build-system) (native-inputs (list pkg-config)) (inputs (list fontconfig fribidi @@ -1065,9 +1066,9 @@ (define-public icewm ;; strtest.cc tests failing due to $HOME and /etc setup ;; difference under guix (lambda _ - (substitute* "src/Makefile.in" - (("TESTS = strtest\\$\\(EXEEXT\\)") - "TESTS = "))))))) + (substitute* "src/CMakeLists.txt" + (("add_test\\(strtest \\$\\{CMAKE_BINARY_DIR\\}/strtest\\)") + ""))))))) (home-page "https://ice-wm.org/") (synopsis "Window manager for the X Window System") (description