[bug#65334] [PATCH]: Update sbcl-trivial-clipboard to 0.0.0-6.6ddf8d5

[bug#65334] [PATCH]: Update sbcl-trivial-clipboard to 0.0.0-6.6ddf8d5

[André A. Gomes]

[-- Attachment #1: Type: text/plain, Size: 117 bytes --]

Hi Guix,

Please find the patch attached.  Thanks.


-- 
André A. Gomes
"You cannot even find the ruins..."

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-sbcl-trivial-clipboard-Update-to-0.0.0-6.6ddf8d5.patch --]
[-- Type: text/x-patch, Size: 1702 bytes --]

From 8932019e9772c49bb5cfe6f934798d1de2e53161 Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Wed, 16 Aug 2023 10:27:30 +0300
Subject: [PATCH] gnu: sbcl-trivial-clipboard: Update to 0.0.0-6.6ddf8d5.

* gnu/packages/lisp-xyz.scm (sbcl-trivial-clipboard): Update to 0.0.0-6.6ddf8d5.
---
 gnu/packages/lisp-xyz.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index e1428d8131..81c50cebdc 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -5486,10 +5486,11 @@ (define-public cl-trivial-arguments
   (sbcl-package->cl-source-package sbcl-trivial-arguments))
 
 (define-public sbcl-trivial-clipboard
-  (let ((commit "13b53720306c0e6a13eccf4674d28ee5361127ae"))
+  (let ((commit "6ddf8d5dff8f5c2102af7cd1a1751cbe6408377b")
+        (revision "6"))
     (package
       (name "sbcl-trivial-clipboard")
-      (version (git-version "0.0.0.0" "5" commit))
+      (version (git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5499,12 +5500,12 @@ (define-public sbcl-trivial-clipboard
          (file-name (git-file-name "trivial-clipboard" version))
          (sha256
           (base32
-           "0l198m1gg2ixc43lqjq1ffd80s1sjxhqf1w83qqa1cn51rra2jp8"))))
+           "04qmm69zyx8rs23pfhgzgxn0j108byv3b7skfdv0h01a76wlhplz"))))
       (build-system asdf-build-system/sbcl)
       (inputs
        ;; Pick xsel instead of xclip because its closure size is slightly
        ;; smaller.
-       (list xsel))
+       (list xsel wl-clipboard))
       (native-inputs
        (list sbcl-fiveam))
       (arguments
-- 
2.41.0

[bug#65334] [PATCH]: Update sbcl-trivial-clipboard to 0.0.0-6.6ddf8d5

[Guillaume Le Vaillant]

[-- Attachment #1: Type: text/plain, Size: 118 bytes --]

Hi.
Shouldn't the 'fix-paths' phase be updated for the wl-copy and wl-paste
commands from the new wl-clipboard input?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

[bug#65334] [PATCH]: Update sbcl-trivial-clipboard to 0.0.0-6.6ddf8d5

[André A. Gomes]

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

Guillaume Le Vaillant <glv@posteo.net> writes:

> Hi.
> Shouldn't the 'fix-paths' phase be updated for the wl-copy and wl-paste
> commands from the new wl-clipboard input?

Ups, my mistake!  Please find a new patch attached.  Thanks.


-- 
André A. Gomes
"You cannot even find the ruins..."

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-sbcl-trivial-clipboard-Update-to-0.0.0-6.6ddf8d5.patch --]
[-- Type: text/x-patch, Size: 2573 bytes --]

From 773edba506e21a678514d2b671c7574defb3b268 Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Mon, 21 Aug 2023 21:57:32 +0300
Subject: [PATCH] gnu: sbcl-trivial-clipboard: Update to 0.0.0-6.6ddf8d5.

* gnu/packages/lisp-xyz.scm (sbcl-trivial-clipboard): Update to 0.0.0-6.6ddf8d5.
---
 gnu/packages/lisp-xyz.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index e1428d8131..13c40c03f4 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -5486,10 +5486,11 @@ (define-public cl-trivial-arguments
   (sbcl-package->cl-source-package sbcl-trivial-arguments))
 
 (define-public sbcl-trivial-clipboard
-  (let ((commit "13b53720306c0e6a13eccf4674d28ee5361127ae"))
+  (let ((commit "6ddf8d5dff8f5c2102af7cd1a1751cbe6408377b")
+        (revision "6"))
     (package
       (name "sbcl-trivial-clipboard")
-      (version (git-version "0.0.0.0" "5" commit))
+      (version (git-version "0.0.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -5499,12 +5500,12 @@ (define-public sbcl-trivial-clipboard
          (file-name (git-file-name "trivial-clipboard" version))
          (sha256
           (base32
-           "0l198m1gg2ixc43lqjq1ffd80s1sjxhqf1w83qqa1cn51rra2jp8"))))
+           "04qmm69zyx8rs23pfhgzgxn0j108byv3b7skfdv0h01a76wlhplz"))))
       (build-system asdf-build-system/sbcl)
       (inputs
        ;; Pick xsel instead of xclip because its closure size is slightly
        ;; smaller.
-       (list xsel))
+       (list xsel wl-clipboard))
       (native-inputs
        (list sbcl-fiveam))
       (arguments
@@ -5514,7 +5515,13 @@ (define-public sbcl-trivial-clipboard
              (lambda* (#:key inputs #:allow-other-keys)
                (substitute* "src/text.lisp"
                  (("\"xsel\"")
-                  (string-append "\"" (assoc-ref inputs "xsel") "/bin/xsel\""))))))))
+                  (string-append "\"" (assoc-ref inputs "xsel") "/bin/xsel\"")))
+               (substitute* "src/text.lisp"
+                 (("\"wl-copy\"")
+                  (string-append "\"" (assoc-ref inputs "wl-clipboard") "/bin/wl-copy\"")))
+               (substitute* "src/text.lisp"
+                 (("\"wl-paste\"")
+                  (string-append "\"" (assoc-ref inputs "wl-clipboard") "/bin/wl-paste\""))))))))
       (home-page "https://github.com/snmsts/trivial-clipboard")
       (synopsis "Access system clipboard in Common Lisp")
       (description
-- 
2.41.0

bug#65334: [PATCH]: Update sbcl-trivial-clipboard to 0.0.0-6.6ddf8d5

[Guillaume Le Vaillant]

[-- Attachment #1: Type: text/plain, Size: 67 bytes --]

Patch applied as 5dac5882a7ce9c2edf60cd82c4ff083b922574c1.
Thanks.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]