From patchwork Sat Mar 22 07:54:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 40579 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 CBC6427BBE9; Sat, 22 Mar 2025 07:55:25 +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=-5.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,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 E6D7E27BBE2 for ; Sat, 22 Mar 2025 07:55:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tvthD-00011l-G6; Sat, 22 Mar 2025 03:55:08 -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 1tvthA-00011J-1E for guix-patches@gnu.org; Sat, 22 Mar 2025 03:55: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 1tvth9-0000sh-Fb for guix-patches@gnu.org; Sat, 22 Mar 2025 03:55: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:Date:References:In-Reply-To:From:To:Subject; bh=NP6rOHoTwBlNjts7h1UtzVVpA6SV+xlqMvNRUSoha94=; b=X1J5dAAN7XqXUlyttyIifukpm9QY9rMoUCnTWIzH2HZrB+XXGOzHAbI9SzICbkeyci2C+FH0Msw0uRPHbApDwGA4OtCcmjPLJG0kB3WcaXmUgFCAdKjY9KrJwjQpoZEVZNMfcsV9OeIZPQNz+9R2Edi2KRB3JJ5UpVVil1sfaU5L4cMrROts/AnUOh8rIV5qb+A0asxMDOKWyr9zRsekOWum49umNfN0W7zviblv776/afj1fhGMuS2HG+gPzn4ZG4bMgOj85czAEzEfsZ5Q++ObqHEtw2DXRTE0JkX94ccRY8ludYGiu5fVTniDXWmQSCDvvC1a+ruivHiRTpWdmg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tvth8-00032L-9w for guix-patches@gnu.org; Sat, 22 Mar 2025 03:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77146] [PATCH] gnu: icewm: Update to 1.7.2. Resent-From: Z572 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Mar 2025 07:55: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: Andy Tai Cc: 77146@debbugs.gnu.org Received: via spool by 77146-submit@debbugs.gnu.org id=B77146.174263006511600 (code B ref 77146); Sat, 22 Mar 2025 07:55:02 +0000 Received: (at 77146) by debbugs.gnu.org; 22 Mar 2025 07:54:25 +0000 Received: from localhost ([127.0.0.1]:40640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tvtgW-000311-PU for submit@debbugs.gnu.org; Sat, 22 Mar 2025 03:54:25 -0400 Received: from mail.z572.online ([88.99.160.180]:43274) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tvtgU-00030s-Cn for 77146@debbugs.gnu.org; Sat, 22 Mar 2025 03:54:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1742630420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=NP6rOHoTwBlNjts7h1UtzVVpA6SV+xlqMvNRUSoha94=; b=sGot7txtI9NgE8hEXKY6RL1vV3W2oJARB6Jl2xP47raj30GRhqhOtK8+NxagiOl7BCyuvs kncmS413y27KP6AEWfv8s0MMGliNgsQR3dpiMdZdC99HtRr2DUNx+ns7fBmjWMnD5KMfiK rXrMhlzFS6DtEQ6gTtE4qX3clnPH5hE= Received: from m (mail1.85362086.com [107.174.64.25]) by mail.z572.online (OpenSMTPD) with ESMTPSA id 99d60feb (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 22 Mar 2025 08:00:19 +0000 (UTC) From: Z572 In-Reply-To: <65a5656201604af59ef1861d6b257930954bc449.1742544249.git.atai@atai.org> (Andy Tai's message of "Fri, 21 Mar 2025 01:04:24 -0700") References: <65a5656201604af59ef1861d6b257930954bc449.1742544249.git.atai@atai.org> User-Agent: mu4e 1.12.7; emacs 30.0.92 Date: Sat, 22 Mar 2025 15:54:09 +0800 Message-ID: <87v7s1o5zy.fsf@z572.online> 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 Andy Tai writes: > * gnu/packages/wm.scm (icewm): Update to 1.7.2. > > Change-Id: I4ae3b9508507f638afd81405f5d78f2f41ce9d0b > --- > gnu/packages/wm.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm > index 6228f0dd069..02ac353a9cc 100644 > --- a/gnu/packages/wm.scm > +++ b/gnu/packages/wm.scm > @@ -1028,7 +1028,7 @@ (define-public i3lock-fancy > (define-public icewm > (package > (name "icewm") > - (version "3.7.1") > + (version "3.7.2") > (source (origin > (method url-fetch) can we switch to git-fetch? > (uri (string-append > @@ -1036,7 +1036,7 @@ (define-public icewm > version "/icewm-" version ".tar.lz")) > (sha256 > (base32 > - "1n5df4sjjsz0v8g5d7w6msbx86f4a3hljxfn8gsa0snmqm1fb1hd")))) > + "1n02y9i54b4xd0px6mfvwpvm2w796mg26iymsbq63xsjfcsqmvdl")))) > (build-system gnu-build-system) can we switch to cmake-build-system? > (native-inputs (list pkg-config)) > (inputs (list fontconfig > > base-commit: 77ff73a920759437639e8eb77601e51409fefefa Could you test the following patch? From 4baef54abfd67cee398ecf3d3f0efea90d0ecb04 Mon Sep 17 00:00:00 2001 Message-ID: <4baef54abfd67cee398ecf3d3f0efea90d0ecb04.1742629960.git.z572@z572.online> From: Zheng Junjie Date: Sat, 22 Mar 2025 15:13:09 +0800 Subject: [PATCH] gnu: icewm: Switch to git-fetch and use cmake-build-system. * 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 a2c1631e912..326d41fafbe 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 base-commit: c66df8fab38df67b015ad5e63b5b0d65bb6f3d28 prerequisite-patch-id: 02cae64352959fb897963fa5b612ec09ca21c33c prerequisite-patch-id: 5a254f093dab0f7138efcbd9d94fe335964288fb prerequisite-patch-id: f3c8058de2d20a0966093933345967dc8cf72dba -- 2.47.1