gnu: cl-mcclim: Update to 0.9.7-2.292343f.

* gnu/packages/lisp-xyz.scm (sbcl-mcclim): Update to 0.9.7-2.292343f.
  [inputs]: Use new style.
  [arguments]: Update 'fix-paths' phase.
This commit is contained in:
Guillaume Le Vaillant 2022-03-03 15:15:02 +01:00
parent 2c2f54a75b
commit be955121c4
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F

View file

@ -11753,8 +11753,8 @@ functions.")
(sbcl-package->ecl-package sbcl-cl-dejavu)) (sbcl-package->ecl-package sbcl-cl-dejavu))
(define-public sbcl-mcclim (define-public sbcl-mcclim
(let ((commit "04cc542dd4b461b9d56406e40681d1a8f080730f") (let ((commit "292343f9e30c7ef54a3d9b4b045495387c51585e")
(revision "1")) (revision "2"))
(package (package
(name "sbcl-mcclim") (name "sbcl-mcclim")
(version (git-version "0.9.7" revision commit)) (version (git-version "0.9.7" revision commit))
@ -11764,37 +11764,37 @@ functions.")
(uri (git-reference (uri (git-reference
(url "https://github.com/mcclim/mcclim") (url "https://github.com/mcclim/mcclim")
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name "cl-mcclim" version))
(sha256 (sha256
(base32 "1xjly8i62z72hfhlnz5kjd9i8xhrwckc7avyizxvhih67pkjmsx0")))) (base32 "10sq34rk11p2lrpqg5hr4721y2yqpmz9yk88mgdmwn7iyga5f2fp"))))
(build-system asdf-build-system/sbcl) (build-system asdf-build-system/sbcl)
(native-inputs (native-inputs
(list sbcl-fiveam pkg-config)) (list sbcl-fiveam pkg-config))
(inputs (inputs
`(("alexandria" ,sbcl-alexandria) (list fontconfig
("babel" ,sbcl-babel) freetype
("bordeaux-threads" ,sbcl-bordeaux-threads) harfbuzz
("cl-freetype2" ,sbcl-cl-freetype2) sbcl-alexandria
("cl-pdf" ,sbcl-cl-pdf) sbcl-babel
("cffi" ,sbcl-cffi) sbcl-bordeaux-threads
("cl-unicode" ,sbcl-cl-unicode) sbcl-cl-dejavu
("cl-vectors" ,sbcl-cl-vectors) sbcl-cl-freetype2
("closer-mop" ,sbcl-closer-mop) sbcl-cl-pdf
("clx" ,sbcl-clx) sbcl-cffi
("flexi-streams" ,sbcl-flexi-streams) sbcl-cl-unicode
("flexichain" ,sbcl-flexichain) sbcl-cl-vectors
("font-dejavu" ,font-dejavu) sbcl-closer-mop
("fontconfig" ,fontconfig) sbcl-clx
("freetype" ,freetype) sbcl-flexi-streams
("harfbuzz" ,harfbuzz) sbcl-flexichain
("log4cl" ,sbcl-log4cl) sbcl-log4cl
("opticl" ,sbcl-opticl) sbcl-opticl
("spatial-trees" ,sbcl-spatial-trees) sbcl-spatial-trees
("swank" ,sbcl-slime-swank) sbcl-slime-swank
("trivial-features" ,sbcl-trivial-features) sbcl-trivial-features
("trivial-garbage" ,sbcl-trivial-garbage) sbcl-trivial-garbage
("trivial-gray-streams" ,sbcl-trivial-gray-streams) sbcl-trivial-gray-streams
("zpb-ttf" ,sbcl-zpb-ttf))) sbcl-zpb-ttf))
(arguments (arguments
'(#:asd-systems '("mcclim" '(#:asd-systems '("mcclim"
"clim-examples") "clim-examples")
@ -11802,12 +11802,6 @@ functions.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-paths (add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; mcclim-truetype uses DejaVu as default font and
;; sets the path at build time.
(substitute* "Extensions/fonts/fontconfig.lisp"
(("/usr/share/fonts/truetype/dejavu/")
(string-append (assoc-ref inputs "font-dejavu")
"/share/fonts/truetype/")))
(substitute* "Extensions/fontconfig/src/functions.lisp" (substitute* "Extensions/fontconfig/src/functions.lisp"
(("libfontconfig\\.so") (("libfontconfig\\.so")
(search-input-file inputs "/lib/libfontconfig.so"))) (search-input-file inputs "/lib/libfontconfig.so")))
@ -11823,8 +11817,7 @@ functions.")
(string-append "(asdf:load-system :cffi-grovel)\n" all))) (string-append "(asdf:load-system :cffi-grovel)\n" all)))
(substitute* "Extensions/harfbuzz/mcclim-harfbuzz.asd" (substitute* "Extensions/harfbuzz/mcclim-harfbuzz.asd"
(("\\(asdf:defsystem #:mcclim-harfbuzz" all) (("\\(asdf:defsystem #:mcclim-harfbuzz" all)
(string-append "(asdf:load-system :cffi-grovel)\n" all))) (string-append "(asdf:load-system :cffi-grovel)\n" all))))))))
#t)))))
(home-page "https://common-lisp.net/project/mcclim/") (home-page "https://common-lisp.net/project/mcclim/")
(synopsis "Common Lisp GUI toolkit") (synopsis "Common Lisp GUI toolkit")
(description (description