Subject: Re: [bug#77146] [PATCH] gnu: icewm: Update to 1.7.2.

From: Z572 <[email-masked]>
Date: Sat, 22 Mar 2025 15:54:09 +0800

Andy Tai <[email-masked]> 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: <[email-masked]>
From: Zheng Junjie <[email-masked]>
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