~ruther/guix-local

36c794c0ed058ee414cbb90c577f6ade5170470a — Herman Rimm 2 years ago e032a0f
guile-ssh: Update to 0.17.0 and use patch.

* gnu/packages/ssh.scm (guile-ssh): Update to 0.17.0 and apply patch.
* gnu/packages/patches/guile-ssh-rename-bool.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register patch.

Signed-off-by: Artyom V. Poptsov <poptsov.artyom@gmail.com>
Change-Id: Iafb5630430ba122861b7e2fe2c76c84739b4e00f
3 files changed, 44 insertions(+), 2 deletions(-)

M gnu/local.mk
A gnu/packages/patches/guile-ssh-rename-bool.patch
M gnu/packages/ssh.scm
M gnu/local.mk => gnu/local.mk +1 -0
@@ 1503,6 1503,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/guile-hurd-posix-spawn.patch		\
  %D%/packages/patches/guile-present-coding.patch		\
  %D%/packages/patches/guile-rsvg-pkgconfig.patch		\
  %D%/packages/patches/guile-ssh-rename-bool.patch		\
  %D%/packages/patches/guile-emacs-fix-configure.patch		\
  %D%/packages/patches/gtk2-fix-builder-test.patch		\
  %D%/packages/patches/gtk2-harden-list-store.patch		\

A gnu/packages/patches/guile-ssh-rename-bool.patch => gnu/packages/patches/guile-ssh-rename-bool.patch +40 -0
@@ 0,0 1,40 @@
From ad0af631250ce3399127d42995cc0bef6ad3ee5e Mon Sep 17 00:00:00 2001
From: Herman Rimm <herman@rimm.ee>
Date: Sun, 18 Aug 2024 16:05:44 +0200
Subject: [PATCH] libguile-ssh/session-func: Fix variable name

* libguile-ssh/session-func.c (set_bool_opt): Rename bool to boolean.
---
 libguile-ssh/session-func.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libguile-ssh/session-func.c b/libguile-ssh/session-func.c
index 7006b62..b379472 100644
--- a/libguile-ssh/session-func.c
+++ b/libguile-ssh/session-func.c
@@ -228,18 +228,18 @@ set_int32_opt (ssh_session session, int type, SCM value)
   return ssh_options_set (session, type, &c_value);
 }
 
-/* Convert VALUE to integer that represents a boolan value (0
+/* Convert VALUE to integer that represents a boolean value (0
    considered as false, any other value is true), and pass it to
    ssh_options_set */
 static inline int
 set_bool_opt (ssh_session session, int type, SCM value)
 {
-  int32_t bool;
+  int32_t boolean;
 
   SCM_ASSERT (scm_is_bool (value), value, SCM_ARG3, "session-set!");
 
-  bool = scm_to_bool (value);
-  return ssh_options_set (session, type, &bool);
+  boolean = scm_to_bool (value);
+  return ssh_options_set (session, type, &boolean);
 }
 
 /* Convert VALUE to a socket file descriptor and pass it to
-- 
2.45.2


M gnu/packages/ssh.scm => gnu/packages/ssh.scm +3 -2
@@ 326,7 326,7 @@ Additionally, various channel-specific options can be negotiated.")
(define-public guile-ssh
  (package
    (name "guile-ssh")
    (version "0.16.4")
    (version "0.17.0")
    (home-page "https://github.com/artyom-poptsov/guile-ssh")
    (source (origin
              (method git-fetch)


@@ 334,9 334,10 @@ Additionally, various channel-specific options can be negotiated.")
                    (url home-page)
                    (commit (string-append "v" version))))
              (file-name (git-file-name name version))
              (patches (search-patches "guile-ssh-rename-bool.patch"))
              (sha256
               (base32
                "127yhjaywais3h2g3cxhqmhdmqgxf9j1jwb6wzx92j0z7asrjqwr"))))
                "1lkhpgbzvh6i1sc4nmdc9rx9yzrdyjxxjb8x6nvq2zif8xy9y9vg"))))
    (build-system gnu-build-system)
    (outputs '("out" "debug"))
    (arguments