GNU bug report logs - #34507
[PATCH] Update sbcl-clx to 0.7.5

Previous Next

Package: guix-patches;

Reported by: sdilts <stuart.dilts <at> gmail.com>

Date: Sat, 16 Feb 2019 23:01:02 UTC

Severity: normal

Tags: patch

Done: Pierre Neidhardt <mail <at> ambrevar.xyz>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 34507 in the body.
You can then email your comments to 34507 AT debbugs.gnu.org in the normal way.

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#34507; Package guix-patches. (Sat, 16 Feb 2019 23:01:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to sdilts <stuart.dilts <at> gmail.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sat, 16 Feb 2019 23:01:02 GMT) Full text and rfc822 format available.

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

From: sdilts <stuart.dilts <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] Update sbcl-clx to 0.7.5
Date: Sat, 16 Feb 2019 15:59:24 -0700
+ Use a tagged version instead of a commit
+ Add native-dependency sbcl-fiasco for testing
+ All tests pass, so no need to remove any
+ demo module is loaded seperately from the main package,
  so no need to remove it with a patch.
---
 gnu/local.mk                               |  1 -
 gnu/packages/lisp.scm                      | 53 ++++++++--------------
 gnu/packages/patches/clx-remove-demo.patch | 27 -----------
 3 files changed, 20 insertions(+), 61 deletions(-)
 delete mode 100644 gnu/packages/patches/clx-remove-demo.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 3d59e27e8..3bc9d966f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -693,7 +693,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/clementine-use-openssl.patch		\
   %D%/packages/patches/clisp-remove-failing-test.patch		\
   %D%/packages/patches/clucene-pkgconfig.patch			\
-  %D%/packages/patches/clx-remove-demo.patch			\
   %D%/packages/patches/coda-use-system-libs.patch		\
   %D%/packages/patches/combinatorial-blas-awpm.patch		\
   %D%/packages/patches/combinatorial-blas-io-fix.patch		\
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 93dc1aaf8..3b0476a0a 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -914,42 +914,29 @@ ANSI-compliant Common Lisp implementations.")
   (sbcl-package->cl-source-package sbcl-cl-unicode))
 
 (define-public sbcl-clx
-  (let ((revision "1")
-        (commit "1c62774b03c1cf3fe6e5cb532df8b14b44c96b95"))
-    (package
-      (name "sbcl-clx")
-      (version (string-append "0.0.0-" revision "." (string-take commit 7)))
-      (source
-       (origin
-         (method git-fetch)
-         (uri
-          (git-reference
-           (url "https://github.com/sharplispers/clx.git")
-           (commit commit)))
-         (sha256
-          (base32 "0qffag03ns52kwq9xjns2qg1yr0bf3ba507iwq5cmx5xz0b0rmjm"))
-         (file-name (string-append "clx-" version "-checkout"))
-         (patches
-          (list
-           (search-patch "clx-remove-demo.patch")))
-         (modules '((guix build utils)))
-         (snippet
-          '(begin
-             ;; These removed files cause the compiled system to crash when
-             ;; loading.
-             (delete-file-recursively "demo")
-             (delete-file "test/trapezoid.lisp")
-             (substitute* "clx.asd"
-               (("\\(:file \"trapezoid\"\\)") ""))
-             #t))))
-      (build-system asdf-build-system/sbcl)
-      (home-page "http://www.cliki.net/portable-clx")
-      (synopsis "X11 client library for Common Lisp")
-      (description "CLX is an X11 client library for Common Lisp.  The code was
+  (package
+   (name "sbcl-clx")
+   (version "0.7.5")
+   (source
+    (origin
+     (method git-fetch)
+     (uri
+      (git-reference
+       (url "https://github.com/sharplispers/clx.git")
+       (commit version)))
+     (sha256
+      (base32 "1vi67z9hpj5rr4xcmfbfwzmlcc0ah7hzhrmfid6lqdkva238v2wf"))
+     (file-name (git-file-name name version))
+     (modules '((guix build utils)))))
+   (build-system asdf-build-system/sbcl)
+   (native-inputs `(("fiasco" ,sbcl-fiasco)))
+   (home-page "http://www.cliki.net/portable-clx")
+   (synopsis "X11 client library for Common Lisp")
+   (description "CLX is an X11 client library for Common Lisp.  The code was
 originally taken from a CMUCL distribution, was modified somewhat in order to
 make it compile and run under SBCL, then a selection of patches were added
 from other CLXes around the net.")
-      (license license:x11))))
+   (license license:x11))))
 
 (define-public cl-clx
   (sbcl-package->cl-source-package sbcl-clx))
diff --git a/gnu/packages/patches/clx-remove-demo.patch b/gnu/packages/patches/clx-remove-demo.patch
deleted file mode 100644
index c5fffea0d..000000000
--- a/gnu/packages/patches/clx-remove-demo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/clx.asd	2016-02-16 00:06:48.161596976 -0500
-+++ b/clx.asd	2016-02-16 00:06:54.793774658 -0500
-@@ -79,24 +79,6 @@
-                (:file "xtest")
-                (:file "screensaver")
-                (:file "xinerama")))
--     (:module demo
--	      :default-component-class example-source-file
--	      :components
--	      ((:file "bezier")
--	       ;; KLUDGE: this requires "bezier" for proper operation,
--	       ;; but we don't declare that dependency here, because
--	       ;; asdf doesn't load example files anyway.
--	       (:file "beziertest")
--	       (:file "clclock")
--               (:file "clipboard")
--	       (:file "clx-demos")
--	       (:file "gl-test")
--	       ;; FIXME: compiling this generates 30-odd spurious code
--	       ;; deletion notes.  Find out why, and either fix or
--	       ;; workaround the problem.
--	       (:file "mandel")
--	       (:file "menu")
--	       (:file "zoid")))
-      (:module test
- 	      :default-component-class example-source-file
- 	      :components
-- 
2.20.1





Information forwarded to guix-patches <at> gnu.org:
bug#34507; Package guix-patches. (Fri, 18 Oct 2019 09:08:01 GMT) Full text and rfc822 format available.

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

From: Pierre Neidhardt <mail <at> ambrevar.xyz>
To: sdilts <stuart.dilts <at> gmail.com>
Cc: 34507 <at> debbugs.gnu.org
Subject: Re: [bug#34507] [PATCH] Update sbcl-clx to 0.7.5
Date: Fri, 18 Oct 2019 11:07:09 +0200
[Message part 1 (text/plain, inline)]
This was fixed by Pierre Langlois with commit
c894b80324d82f2f807578efa1de792ed1331eb3.

Sorry for the late notice.

-- 
Pierre Neidhardt
https://ambrevar.xyz/
[signature.asc (application/pgp-signature, inline)]

bug closed, send any further explanations to 34507 <at> debbugs.gnu.org and sdilts <stuart.dilts <at> gmail.com> Request was from Pierre Neidhardt <mail <at> ambrevar.xyz> to control <at> debbugs.gnu.org. (Fri, 18 Oct 2019 09:08:02 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 15 Nov 2019 12:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 4 years and 136 days ago.

Previous Next


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