From patchwork Sat Feb 16 22:59:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sdilts X-Patchwork-Id: 1104 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4273416C48; Sat, 16 Feb 2019 23:01:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id CEEDD16C42 for ; Sat, 16 Feb 2019 23:01:15 +0000 (GMT) Received: from localhost ([127.0.0.1]:33769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gv8xP-0008FT-GD for patchwork@mira.cbaines.net; Sat, 16 Feb 2019 18:01:15 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#34507] [PATCH] Update sbcl-clx to 0.7.5 Resent-From: sdilts Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Feb 2019 23:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34507 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34507@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1550358004823 (code B ref -1); Sat, 16 Feb 2019 23:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Feb 2019 23:00:04 +0000 Received: from localhost ([127.0.0.1]:50602 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gv8wF-0000DA-2o for submit@debbugs.gnu.org; Sat, 16 Feb 2019 18:00:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gv8wC-0000CB-DP for submit@debbugs.gnu.org; Sat, 16 Feb 2019 18:00:01 -0500 Received: from lists.gnu.org ([209.51.188.17]:33552) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gv8w4-0005rt-5y for submit@debbugs.gnu.org; Sat, 16 Feb 2019 17:59:53 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=/0DYxeXLe2CyQlP4eAnZhEXH/Yo+C8qTBX+wpjK4i30=; b=EYw2rTmgDeTG0zEqz/2KRY/M6U1EdgBmJbP9T7JuouaL1xibi0fWhxlDZe/Ixk7/LH Q6qwQo0o7LDOR6QVz7EO1lbRiYOM1ucdyzamXbDWoVH7b2k1LzhI+0JJ7nzAZ+DmpPN4 T/JYMkqFTbpOvl3yCM7uKM4vx/01ylpogEoHJfItIK+vMsdOMu64nitSv1g78T9b5h1G xSmDYHZ8pBEbMnYopk6wNmujrXDQRj3siCPMY6cc3qD/8dlbl5v9VB4XaW6cYbYIk2l6 hixoUI+lCKuxumpgXft8iPTVz+RMzu2ViYtDJT1KMEDND0jq4oisvkud08fAodJf91mo E1Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=/0DYxeXLe2CyQlP4eAnZhEXH/Yo+C8qTBX+wpjK4i30=; b=O/9GZ5l0iUc4163F43mWdv6cldJNELXjynHvbe6Z8vJCIcOc64Uh+6zi2LcjNd5QaE bt78SPWYlZXhwvr9YvsLnW1w8AJC37Pfb/DC8xgJQVAsaWbrbodMgMLGmfidfSzuYhQA SxWy7WB/MuGHyLZ4iXAxvi/jE2EmG1THw6HkHkRROLzgLajl3k0j1pq/KPV/YEk/hnFm hW2zs7VKHs2BaU/lNHSqokfTbHLQYrv4QtuIa0zSNTGp103+3DKDTgwcFWbTX7gZ1jT5 Ur6utS/YksJl+1rymg+WhMk7yzOhGqFno+s6KgOvvMgABcBSD35qQXjuThiFWp658Sfy slIg== X-Gm-Message-State: AHQUAuYUFLU9+BaJnzr0oi1VV9w2XH5Cb2+AWgfF5qZLuoaA/HcCDb5E 3OS+tbAuhKzIqwyyQRgXl15p6s5+ X-Google-Smtp-Source: AHgI3IaeXNv4IQheADRL+PZTtzvwphFsKl1G6/Doow5TU0I+cDotAoF41D3PMRnLktt884822BIG6w== X-Received: by 2002:a17:902:44c:: with SMTP id 70mr16246644ple.318.1550357973109; Sat, 16 Feb 2019 14:59:33 -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-Disposition: inline User-Agent: Mutt/1.11.2 (2019-01-07) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches + 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