bug#70053: closed ([PATCH] gnu: rust-xkbcommon-dl: Fix loading of libxkbcommon-x11.so.)

[GNU bug Tracking System]

Your message dated Fri, 29 Mar 2024 19:10:10 +0000
with message-id <87le60n9bh.fsf@gmail.com>
and subject line [PATCH] gnu: rust-xkbcommon-dl: Fix loading of 
libxkbcommon-x11.so.
has caused the debbugs.gnu.org bug report #70053,
regarding [PATCH] gnu: rust-xkbcommon-dl: Fix loading of libxkbcommon-x11.so.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
70053: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=70053
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: rust-xkbcommon-dl: Fix loading of libxkbcommon-x11.so.
>
>
>
>
> Date: 
>
> Thu, 28 Mar 2024 13:02:24 +0000
>
>
>
>
> This to resolve Alacritty segmentation fault reported in #68243, attemp
> to fix in #69797.
>
> * gnu/packages/crates-graphics.scm (rust-xkbcommon-dl) [arguments]:
> Handle libxkbcommon-x11.so in the ‘add-absolute-library-references’
> phase.
>
> Change-Id: Ib724775210cfad7dedaa454f0f456c0dded67dcc
> ---
>  gnu/packages/crates-graphics.scm | 14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm
> index f95a4a65cd..117b4f5603 100644
> --- a/gnu/packages/crates-graphics.scm
> +++ b/gnu/packages/crates-graphics.scm
> @@ -15,6 +15,7 @@
>  ;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
>  ;;; Copyright © 2023, 2024 Jaeme Sifat <jaeme@runbox.com>
>  ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
> +;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -5745,7 +5746,18 @@ (define-public rust-xkbcommon-dl-0.4
>                         ("rust-dlib" ,rust-dlib-0.5)
>                         ("rust-log" ,rust-log-0.4)
>                         ("rust-once-cell" ,rust-once-cell-1)
> -                       ("rust-xkeysym" ,rust-xkeysym-0.2))))
> +                       ("rust-xkeysym" ,rust-xkeysym-0.2))
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'configure 'add-absolute-library-references
> +           (lambda* (#:key inputs vendor-dir #:allow-other-keys)
> +             (substitute* (find-files vendor-dir "\\.rs$")
> +               (("libxkbcommon-x11\\.so")
> +                (search-input-file inputs "lib/libxkbcommon-x11.so"))
> +               (("libxkbcommon\\.so")
> +                (search-input-file inputs "lib/libxkbcommon.so"))))))))
> +    (inputs
> +     (list libxkbcommon))
>      (home-page "https://github.com/rust-windowing/xkbcommon-dl";)
>      (synopsis "Dynamically loaded xkbcommon and xkbcommon-x11 Rust bindings")
>      (description
>
> base-commit: fb9549164520ad993c2fbbaedc899844d57baabc
> -- 
> 2.41.0
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: [PATCH] gnu: rust-xkbcommon-dl: Fix loading of libxkbcommon-x11.so. Date: Fri, 29 Mar 2024 19:10:10 +0000

Pushed as 423ca234cbd7b4902fd2a3fbc089a6fd57ed5583 to master.

--
Oleg

signature.asc
Description: PGP signature

--- End Message ---