From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:45940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gv8xF-0008DR-Lt for guix-patches@gnu.org; Sat, 16 Feb 2019 18:01:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gv8xD-0006b1-PB for guix-patches@gnu.org; Sat, 16 Feb 2019 18:01:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51321) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gv8xC-0006aY-NM for guix-patches@gnu.org; Sat, 16 Feb 2019 18:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gv8xC-0000Fv-Fk for guix-patches@gnu.org; Sat, 16 Feb 2019 18:01:02 -0500 Subject: [bug#34507] [PATCH] Update sbcl-clx to 0.7.5 Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:45723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gv8w2-0007vQ-Vb for guix-patches@gnu.org; Sat, 16 Feb 2019 17:59:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gv8vx-0005pj-2q for guix-patches@gnu.org; Sat, 16 Feb 2019 17:59:49 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:45641) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gv8vs-0005mh-K0 for guix-patches@gnu.org; Sat, 16 Feb 2019 17:59:43 -0500 Received: by mail-pl1-x636.google.com with SMTP id r14so6808681pls.12 for ; Sat, 16 Feb 2019 14:59:34 -0800 (PST) Received: from thinkpad-linux ([162.211.128.122]) by smtp.gmail.com with ESMTPSA id x2sm13740649pfx.78.2019.02.16.14.59.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Feb 2019 14:59:32 -0800 (PST) Date: Sat, 16 Feb 2019 15:59:24 -0700 From: sdilts Message-ID: <20190216225915.GA13140@thinkpad-linux> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34507@debbugs.gnu.org + 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