GNU bug report logs - #77146
[PATCH] gnu: icewm: Update to 1.7.2.

Previous Next

Package: guix-patches;

Reported by: Andy Tai <atai <at> atai.org>

Date: Fri, 21 Mar 2025 08:05:04 UTC

Severity: normal

Tags: patch

Done: Z572 <z572 <at> z572.online>

To reply to this bug, email your comments to 77146 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#77146; Package guix-patches. (Fri, 21 Mar 2025 08:05:05 GMT) Full text and rfc822 format available.
Acknowledgement sent to Andy Tai <atai <at> atai.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Fri, 21 Mar 2025 08:05:05 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: guix-patches <at> gnu.org
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH] gnu: icewm: Update to 1.7.2.
Date: Fri, 21 Mar 2025 01:04:24 -0700

* 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)
               (uri (string-append
@@ -1036,7 +1036,7 @@ (define-public icewm
                     version "/icewm-" version ".tar.lz"))
               (sha256
                (base32
-                "1n5df4sjjsz0v8g5d7w6msbx86f4a3hljxfn8gsa0snmqm1fb1hd"))))
+                "1n02y9i54b4xd0px6mfvwpvm2w796mg26iymsbq63xsjfcsqmvdl"))))
     (build-system gnu-build-system)
     (native-inputs (list pkg-config))
     (inputs (list fontconfig

base-commit: 77ff73a920759437639e8eb77601e51409fefefa
-- 
2.43.0
Information forwarded to guix-patches <at> gnu.org:
bug#77146; Package guix-patches. (Sat, 22 Mar 2025 07:55:02 GMT) Full text and rfc822 format available.

Message #8 received at 77146 <at> debbugs.gnu.org (full text, mbox):

From: Z572 <z572 <at> z572.online>
To: Andy Tai <atai <at> atai.org>
Cc: 77146 <at> debbugs.gnu.org
Subject: Re: [bug#77146] [PATCH] gnu: icewm: Update to 1.7.2.
Date: Sat, 22 Mar 2025 15:54:09 +0800

[Message part 1 (text/plain, inline)]
Andy Tai <atai <at> atai.org> 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?


[0001-gnu-icewm-Switch-to-git-fetch-and-use-cmake-build-sy.patch (text/x-patch, inline)]
From 4baef54abfd67cee398ecf3d3f0efea90d0ecb04 Mon Sep 17 00:00:00 2001
Message-ID: <4baef54abfd67cee398ecf3d3f0efea90d0ecb04.1742629960.git.z572 <at> z572.online>
From: Zheng Junjie <z572 <at> z572.online>
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


[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#77146; Package guix-patches. (Sat, 22 Mar 2025 08:23:01 GMT) Full text and rfc822 format available.

Message #11 received at 77146 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 77146 <at> debbugs.gnu.org,
	z572 <at> z572.online
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v2 0/2] *** icewm: update and switch to git, cmake ***
Date: Sat, 22 Mar 2025 01:22:29 -0700

*** icewm: update and switch to git fetch and cmake  ***

Andy Tai (1):
  gnu: icewm: Update to 3.7.2.

Zheng Junjie (1):
  gnu: icewm: Switch to git-fetch and use cmake-build-system.

 gnu/packages/wm.scm | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)


base-commit: e12455a5e8d524c5c3fba1ae56ebc6819b4f9320
--
2.43.0
Information forwarded to guix-patches <at> gnu.org:
bug#77146; Package guix-patches. (Sat, 22 Mar 2025 08:23:02 GMT) Full text and rfc822 format available.

Message #14 received at 77146 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 77146 <at> debbugs.gnu.org,
	z572 <at> z572.online
Cc: Andy Tai <atai <at> atai.org>
Subject: [PATCH v2 1/2] gnu: icewm: Update to 3.7.2.
Date: Sat, 22 Mar 2025 01:22:30 -0700

* gnu/packages/wm.scm (icewm): Update to 3.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)
               (uri (string-append
@@ -1036,7 +1036,7 @@ (define-public icewm
                     version "/icewm-" version ".tar.lz"))
               (sha256
                (base32
-                "1n5df4sjjsz0v8g5d7w6msbx86f4a3hljxfn8gsa0snmqm1fb1hd"))))
+                "1n02y9i54b4xd0px6mfvwpvm2w796mg26iymsbq63xsjfcsqmvdl"))))
     (build-system gnu-build-system)
     (native-inputs (list pkg-config))
     (inputs (list fontconfig
-- 
2.43.0
Information forwarded to guix-patches <at> gnu.org:
bug#77146; Package guix-patches. (Sat, 22 Mar 2025 08:23:02 GMT) Full text and rfc822 format available.

Message #17 received at 77146 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: 77146 <at> debbugs.gnu.org,
	z572 <at> z572.online
Subject: [PATCH v2 2/2] gnu: icewm: Switch to git-fetch and use
 cmake-build-system.
Date: Sat, 22 Mar 2025 01:22:31 -0700

From: Zheng Junjie <z572 <at> z572.online>

* 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
-- 
2.43.0
Information forwarded to guix-patches <at> gnu.org:
bug#77146; Package guix-patches. (Sat, 22 Mar 2025 08:25:01 GMT) Full text and rfc822 format available.

Message #20 received at 77146 <at> debbugs.gnu.org (full text, mbox):

From: Andy Tai <atai <at> atai.org>
To: Z572 <z572 <at> z572.online>
Cc: 77146 <at> debbugs.gnu.org
Subject: Re: [bug#77146] [PATCH] gnu: icewm: Update to 1.7.2.
Date: Sat, 22 Mar 2025 01:23:20 -0700

the amended patches build fine
Reply sent to Z572 <z572 <at> z572.online>:
You have taken responsibility. (Sat, 22 Mar 2025 08:40:02 GMT) Full text and rfc822 format available.
Notification sent to Andy Tai <atai <at> atai.org>:
bug acknowledged by developer. (Sat, 22 Mar 2025 08:40:02 GMT) Full text and rfc822 format available.

Message #25 received at 77146-done <at> debbugs.gnu.org (full text, mbox):

From: Z572 <z572 <at> z572.online>
To: Andy Tai <atai <at> atai.org>
Cc: 77146-done <at> debbugs.gnu.org
Subject: Re: [bug#77146] [PATCH v2 0/2] *** icewm: update and switch to git,
 cmake ***
Date: Sat, 22 Mar 2025 16:39:01 +0800

[Message part 1 (text/plain, inline)]
Andy Tai <atai <at> atai.org> writes:

> *** icewm: update and switch to git fetch and cmake  ***
>
> Andy Tai (1):
>   gnu: icewm: Update to 3.7.2.
>
> Zheng Junjie (1):
>   gnu: icewm: Switch to git-fetch and use cmake-build-system.
>
>  gnu/packages/wm.scm | 21 +++++++++++----------
>  1 file changed, 11 insertions(+), 10 deletions(-)
>
>
> base-commit: e12455a5e8d524c5c3fba1ae56ebc6819b4f9320

pushed, closing.

[signature.asc (application/pgp-signature, inline)]
This bug report was last modified 13 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.