[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/11: gnu: Add cl-clx.
From: |
??? |
Subject: |
08/11: gnu: Add cl-clx. |
Date: |
Sat, 8 Oct 2016 13:26:01 +0000 (UTC) |
iyzsong pushed a commit to branch master
in repository guix.
commit 4b51b21ccfa9b6368f4e4c4150928ba20b4b5369
Author: Andy Patterson <address@hidden>
Date: Sun Oct 2 22:41:36 2016 -0400
gnu: Add cl-clx.
* gnu/packages/lisp.scm (cl-clx, sbcl-clx, ecl-clx): New variables.
* gnu/packages/patches/clx-remove-demo.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
Signed-off-by: 宋文武 <address@hidden>
---
gnu/local.mk | 1 +
gnu/packages/lisp.scm | 45 ++++++++++++++++++++++++++++
gnu/packages/patches/clx-remove-demo.patch | 27 +++++++++++++++++
3 files changed, 73 insertions(+)
diff --git a/gnu/local.mk b/gnu/local.mk
index 1ce95f2..206b794 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -475,6 +475,7 @@ dist_patch_DATA =
\
%D%/packages/patches/clang-libc-search-path.patch \
%D%/packages/patches/clang-3.8-libc-search-path.patch \
%D%/packages/patches/clucene-pkgconfig.patch \
+ %D%/packages/patches/clx-remove-demo.patch \
%D%/packages/patches/cmake-fix-tests.patch \
%D%/packages/patches/cpio-CVE-2016-2037.patch \
%D%/packages/patches/cpufrequtils-fix-aclocal.patch \
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 9b7d8a7..5da2592 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -700,3 +700,48 @@ compatible with ANSI-compliant Common Lisp
implementations.")
(define-public ecl-cl-ppcre
(sbcl-package->ecl-package sbcl-cl-ppcre))
+
+(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\"\\)") ""))))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:special-dependencies '("sb-bsd-sockets")))
+ (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))))
+
+(define-public cl-clx
+ (sbcl-package->cl-source-package sbcl-clx))
+
+(define-public ecl-clx
+ (sbcl-package->ecl-package sbcl-clx))
diff --git a/gnu/packages/patches/clx-remove-demo.patch
b/gnu/packages/patches/clx-remove-demo.patch
new file mode 100644
index 0000000..c5fffea
--- /dev/null
+++ b/gnu/packages/patches/clx-remove-demo.patch
@@ -0,0 +1,27 @@
+--- 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
- branch master updated (53aec09 -> 9678443), ???, 2016/10/08
- 03/11: gnu: Add cl-fiveam., ???, 2016/10/08
- 06/11: gnu: Add cl-flexi-streams., ???, 2016/10/08
- 05/11: gnu: Add cl-trivial-gray-streams., ???, 2016/10/08
- 04/11: gnu: Add cl-bordeaux-threads., ???, 2016/10/08
- 02/11: gnu: Add cl-alexandria., ???, 2016/10/08
- 07/11: gnu: Add cl-ppcre., ???, 2016/10/08
- 11/11: gnu: Add sbcl-stumpwm-with-slynk., ???, 2016/10/08
- 09/11: gnu: Add cl-stumpwm., ???, 2016/10/08
- 10/11: gnu: Add cl-slynk., ???, 2016/10/08
- 08/11: gnu: Add cl-clx.,
??? <=
- 01/11: build-system: Add asdf-build-system., ???, 2016/10/08