bug#69129: sbcl-mcclim broke on upgrade to sbcl@2.4.0

2024-02-17 Thread Carlo Zancanaro 
On Sat, Feb 17 2024, Sharlatan Hellseher wrote:
> I've added copyright header and use version field for commit.

Thanks for that. I feel like this work was entirely mechanical, so I
would have been fine without a copyright header, but I appreciate it.

I'm curious about the version/commit change, though. Given the -yule
suffix on the tag name changes with each version we will still need to
manually update the origin's commit. It feels like unnecessary
indirection to me. What is the benefit to referencing the package's
version in the origin like this?

Carlo

bug#69129: sbcl-mcclim broke on upgrade to sbcl@2.4.0

2024-02-17 Thread Sharlatan Hellseher 

Hi,

I've added copyright header and use version field for commit.

Pushed as 4fecd14409..3cf199dbcf to master.

--
Oleg


signature.asc
Description: PGP signature

bug#69129: [PATCH v2 2/2] gnu: sbcl-mcclim: Reformatting.

2024-02-17 Thread Carlo Zancanaro 
* gnu/packages/lisp-xyz.scm (sbcl-mcclim): Remove let and reindent.

Change-Id: Ib7faade37178aff779fbffe1cb439367b5740b91
---
 gnu/packages/lisp-xyz.scm | 129 +++---
 1 file changed, 64 insertions(+), 65 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 5a8108e811..7b145398fa 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -15481,72 +15481,71 @@ (define-public ecl-dejavu
   (sbcl-package->ecl-package sbcl-cl-dejavu))
 
 (define-public sbcl-mcclim
-  (let ((commit #f)) ; avoiding changing indentation
-(package
-  (name "sbcl-mcclim")
-  (version "0.9.8")
-  (source
-   (origin
- (method git-fetch)
- (uri (git-reference
-   (url "https://codeberg.org/McCLIM/McCLIM";)
-   (commit "0.9.8-yule")))
- (file-name (git-file-name "cl-mcclim" version))
- (sha256
-  (base32 "0gbi61jnnsz6fvhv18mf57jkq46bvcd0355vqdcnrni7xyi10sk8"
-  (build-system asdf-build-system/sbcl)
-  (native-inputs
-   (list sbcl-fiveam pkg-config))
-  (inputs
-   (list fontconfig
- freetype
- harfbuzz
- sbcl-alexandria
- sbcl-babel
- sbcl-bordeaux-threads
- sbcl-cffi
- sbcl-cl-base64
- sbcl-cl-dejavu
- sbcl-cl-freetype2
- sbcl-cl-pdf
- sbcl-cl-unicode
- sbcl-cl-vectors
- sbcl-cl-who
- sbcl-closer-mop
- sbcl-cluffer
- sbcl-clx
- sbcl-flexi-streams
- sbcl-flexichain
- sbcl-log4cl
- sbcl-lorem-ipsum
- sbcl-opticl
- sbcl-slime-swank
- sbcl-spatial-trees
- sbcl-trivial-features
- sbcl-trivial-garbage
- sbcl-trivial-gray-streams
- sbcl-zpb-ttf))
-  (arguments
-   '(#:asd-systems '("mcclim"
- "clim-examples"
- ;; clim-debugger is required by cleavir.
- "clim-debugger")
- #:phases
- (modify-phases %standard-phases
-   (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
-   (substitute* "Extensions/fontconfig/src/functions.lisp"
- (("libfontconfig\\.so")
-  (search-input-file inputs "/lib/libfontconfig.so")))
-   (substitute* "Extensions/harfbuzz/src/functions.lisp"
- (("libharfbuzz\\.so")
-  (search-input-file inputs "/lib/libharfbuzz.so"
-  (home-page "https://mcclim.common-lisp.dev/";)
-  (synopsis "Common Lisp GUI toolkit")
-  (description
-   "McCLIM is an implementation of the @emph{Common Lisp Interface Manager
+  (package
+(name "sbcl-mcclim")
+(version "0.9.8")
+(source
+ (origin
+   (method git-fetch)
+   (uri (git-reference
+ (url "https://codeberg.org/McCLIM/McCLIM";)
+ (commit "0.9.8-yule")))
+   (file-name (git-file-name "cl-mcclim" version))
+   (sha256
+(base32 "0gbi61jnnsz6fvhv18mf57jkq46bvcd0355vqdcnrni7xyi10sk8"
+(build-system asdf-build-system/sbcl)
+(native-inputs
+ (list sbcl-fiveam pkg-config))
+(inputs
+ (list fontconfig
+   freetype
+   harfbuzz
+   sbcl-alexandria
+   sbcl-babel
+   sbcl-bordeaux-threads
+   sbcl-cffi
+   sbcl-cl-base64
+   sbcl-cl-dejavu
+   sbcl-cl-freetype2
+   sbcl-cl-pdf
+   sbcl-cl-unicode
+   sbcl-cl-vectors
+   sbcl-cl-who
+   sbcl-closer-mop
+   sbcl-cluffer
+   sbcl-clx
+   sbcl-flexi-streams
+   sbcl-flexichain
+   sbcl-log4cl
+   sbcl-lorem-ipsum
+   sbcl-opticl
+   sbcl-slime-swank
+   sbcl-spatial-trees
+   sbcl-trivial-features
+   sbcl-trivial-garbage
+   sbcl-trivial-gray-streams
+   sbcl-zpb-ttf))
+(arguments
+ '(#:asd-systems '("mcclim"
+   "clim-examples"
+   ;; clim-debugger is required by cleavir.
+   "clim-debugger")
+   #:phases
+   (modify-phases %standard-phases
+ (add-after 'unpack 'fix-paths
+   (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "Extensions/fontconfig/src/functions.lisp"
+   (("libfontconfig\\.so")
+(search-input-file inputs "/lib/libfontconfig.so")))
+ (substitute* "Extensions/harfbuzz/src/functions.lisp"
+   (("libharfbuzz\\.so")
+(search-input-file inputs "/lib/libharfbuzz.so"
+(home-page "https://mcclim.common-lisp.dev/";)
+(synopsis "Common Lisp GUI toolkit")
+(description
+ "McCLIM is an implementation

bug#69129: [PATCH v2 1/2] gnu: sbcl-mcclim: Update to 0.9.8.

2024-02-17 Thread Carlo Zancanaro 
* gnu/packages/lisp-xyz.scm (sbcl-mcclim): Update to 0.9.8, and add
sbcl-cluffer and sbcl-lorem-ipsum inputs.

Change-Id: I35bed62483973e2dd6f6f142df096abf765b4208
---
 gnu/packages/lisp-xyz.scm | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 045a3e939a..5a8108e811 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -15481,20 +15481,19 @@ (define-public ecl-dejavu
   (sbcl-package->ecl-package sbcl-cl-dejavu))
 
 (define-public sbcl-mcclim
-  (let ((commit "ece91cf035e2ccb1c6eb0bb867ae2bc45f627982")
-(revision "3"))
+  (let ((commit #f)) ; avoiding changing indentation
 (package
   (name "sbcl-mcclim")
-  (version (git-version "0.9.7" revision commit))
+  (version "0.9.8")
   (source
(origin
  (method git-fetch)
  (uri (git-reference
(url "https://codeberg.org/McCLIM/McCLIM";)
-   (commit commit)))
+   (commit "0.9.8-yule")))
  (file-name (git-file-name "cl-mcclim" version))
  (sha256
-  (base32 "0prn4f0nz604ykcg8004f1vndgjm7181wrlblq6mhasphca28c2k"
+  (base32 "0gbi61jnnsz6fvhv18mf57jkq46bvcd0355vqdcnrni7xyi10sk8"
   (build-system asdf-build-system/sbcl)
   (native-inputs
(list sbcl-fiveam pkg-config))
@@ -15514,10 +15513,12 @@ (define-public sbcl-mcclim
  sbcl-cl-vectors
  sbcl-cl-who
  sbcl-closer-mop
+ sbcl-cluffer
  sbcl-clx
  sbcl-flexi-streams
  sbcl-flexichain
  sbcl-log4cl
+ sbcl-lorem-ipsum
  sbcl-opticl
  sbcl-slime-swank
  sbcl-spatial-trees

base-commit: 91d80460296e2d5a01704d0f34fb966a45a165ae
-- 
2.41.0

bug#69129: [PATCH] gnu: sbcl-mcclim: Update to 0.9.8.

2024-02-17 Thread Sharlatan Hellseher 
Hi Carlo,

Thank you for the patch!

May you split it into 2 please? One just updating version and adding missing
inputs the other indent it. It would ease the review process to visually
identify what was changed.

Looking froward for v2!

Thanks,
Oleg

bug#69129: [PATCH] gnu: sbcl-mcclim: Update to 0.9.8.

2024-02-17 Thread Carlo Zancanaro 
* gnu/packages/lisp-xyz.scm (sbcl-mcclim): Update to 0.9.8, and add
sbcl-cluffer and sbcl-lorem-ipsum inputs.

Change-Id: I35bed62483973e2dd6f6f142df096abf765b4208
---

I have attempted to update sbcl-mcclim. I tested using the same steps
as Guillaume:

  $ guix shell sbcl sbcl-mcclim -- sbcl --no-userinit

Then at the sbcl prompt I ran:

  (require :asdf)
  (asdf:load-system "clim-examples")
  (clim-demo:demodemo)

Then I opened the stream test and it seemed to work properly. Testing
without this patch I could reproduce the failure, so hopefully this
fixes the real problems, too.

I didn't properly check all of the inputs, I just added the inputs
that I needed to make asdf happy and for it to build.

 gnu/packages/lisp-xyz.scm | 128 +++---
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 045a3e939a..7b145398fa 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -15481,71 +15481,71 @@ (define-public ecl-dejavu
   (sbcl-package->ecl-package sbcl-cl-dejavu))
 
 (define-public sbcl-mcclim
-  (let ((commit "ece91cf035e2ccb1c6eb0bb867ae2bc45f627982")
-(revision "3"))
-(package
-  (name "sbcl-mcclim")
-  (version (git-version "0.9.7" revision commit))
-  (source
-   (origin
- (method git-fetch)
- (uri (git-reference
-   (url "https://codeberg.org/McCLIM/McCLIM";)
-   (commit commit)))
- (file-name (git-file-name "cl-mcclim" version))
- (sha256
-  (base32 "0prn4f0nz604ykcg8004f1vndgjm7181wrlblq6mhasphca28c2k"
-  (build-system asdf-build-system/sbcl)
-  (native-inputs
-   (list sbcl-fiveam pkg-config))
-  (inputs
-   (list fontconfig
- freetype
- harfbuzz
- sbcl-alexandria
- sbcl-babel
- sbcl-bordeaux-threads
- sbcl-cffi
- sbcl-cl-base64
- sbcl-cl-dejavu
- sbcl-cl-freetype2
- sbcl-cl-pdf
- sbcl-cl-unicode
- sbcl-cl-vectors
- sbcl-cl-who
- sbcl-closer-mop
- sbcl-clx
- sbcl-flexi-streams
- sbcl-flexichain
- sbcl-log4cl
- sbcl-opticl
- sbcl-slime-swank
- sbcl-spatial-trees
- sbcl-trivial-features
- sbcl-trivial-garbage
- sbcl-trivial-gray-streams
- sbcl-zpb-ttf))
-  (arguments
-   '(#:asd-systems '("mcclim"
- "clim-examples"
- ;; clim-debugger is required by cleavir.
- "clim-debugger")
- #:phases
- (modify-phases %standard-phases
-   (add-after 'unpack 'fix-paths
- (lambda* (#:key inputs #:allow-other-keys)
-   (substitute* "Extensions/fontconfig/src/functions.lisp"
- (("libfontconfig\\.so")
-  (search-input-file inputs "/lib/libfontconfig.so")))
-   (substitute* "Extensions/harfbuzz/src/functions.lisp"
- (("libharfbuzz\\.so")
-  (search-input-file inputs "/lib/libharfbuzz.so"
-  (home-page "https://mcclim.common-lisp.dev/";)
-  (synopsis "Common Lisp GUI toolkit")
-  (description
-   "McCLIM is an implementation of the @emph{Common Lisp Interface Manager
+  (package
+(name "sbcl-mcclim")
+(version "0.9.8")
+(source
+ (origin
+   (method git-fetch)
+   (uri (git-reference
+ (url "https://codeberg.org/McCLIM/McCLIM";)
+ (commit "0.9.8-yule")))
+   (file-name (git-file-name "cl-mcclim" version))
+   (sha256
+(base32 "0gbi61jnnsz6fvhv18mf57jkq46bvcd0355vqdcnrni7xyi10sk8"
+(build-system asdf-build-system/sbcl)
+(native-inputs
+ (list sbcl-fiveam pkg-config))
+(inputs
+ (list fontconfig
+   freetype
+   harfbuzz
+   sbcl-alexandria
+   sbcl-babel
+   sbcl-bordeaux-threads
+   sbcl-cffi
+   sbcl-cl-base64
+   sbcl-cl-dejavu
+   sbcl-cl-freetype2
+   sbcl-cl-pdf
+   sbcl-cl-unicode
+   sbcl-cl-vectors
+   sbcl-cl-who
+   sbcl-closer-mop
+   sbcl-cluffer
+   sbcl-clx
+   sbcl-flexi-streams
+   sbcl-flexichain
+   sbcl-log4cl
+   sbcl-lorem-ipsum
+   sbcl-opticl
+   sbcl-slime-swank
+   sbcl-spatial-trees
+   sbcl-trivial-features
+   sbcl-trivial-garbage
+   sbcl-trivial-gray-streams
+   sbcl-zpb-ttf))
+(arguments
+ '(#:asd-systems '("mcclim"
+   "clim-examples"
+   ;; clim-debugger is required by cleavir.
+   "clim-debugger")
+   #:phases
+   (modify-phases %standard-phases
+ (add-aft