From patchwork Thu Mar 28 13:02:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 62331 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 1D07127BBE2; Thu, 28 Mar 2024 13:05:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 816B927BBE9 for ; Thu, 28 Mar 2024 13:05:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rppQK-0000yJ-K1; Thu, 28 Mar 2024 09:04:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rppQJ-0000oM-6q for guix-patches@gnu.org; Thu, 28 Mar 2024 09:04:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rppQI-0008BB-PA for guix-patches@gnu.org; Thu, 28 Mar 2024 09:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rppQI-0007KP-M6; Thu, 28 Mar 2024 09:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70053] [PATCH] gnu: rust-xkbcommon-dl: Fix loading of libxkbcommon-x11.so. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Thu, 28 Mar 2024 13:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70053 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70053@debbugs.gnu.org Cc: Sharlatan Hellseher , Efraim Flashner X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by submit@debbugs.gnu.org id=B.171163098327946 (code B ref -1); Thu, 28 Mar 2024 13:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Mar 2024 13:03:03 +0000 Received: from localhost ([127.0.0.1]:39550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rppPG-0007GK-Jo for submit@debbugs.gnu.org; Thu, 28 Mar 2024 09:03:02 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37168) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rppPA-0007FV-RS for submit@debbugs.gnu.org; Thu, 28 Mar 2024 09:02:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rppOx-0008F7-8L for guix-patches@gnu.org; Thu, 28 Mar 2024 09:02:40 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rppOq-000838-RF for guix-patches@gnu.org; Thu, 28 Mar 2024 09:02:38 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-415482307b0so3464755e9.0 for ; Thu, 28 Mar 2024 06:02:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711630949; x=1712235749; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ayaIlPzGHo9ojku/ScQV9ilhbecwwZFA0IztSv09FRg=; b=gyFqB1evi2FPSI/Xtki3nEKTGcEB8hhzJQ+UWw6c0xYpMjb52ap1Bxu7SGQmIMxImP ZOWng/Rvh7Q/SyHXV5fGu02df9VGSXXvBHyff4popSs4wVpSQlQVlG+bbAKhH/CQWiFI R5EcZEHT6m8fXzv3goO5PKLpjqxerejcrxm0lPajzm0ZwX/FR7Dg7f/1ltEzOWziHUVR HZWrp6FFSviciLY1kjaqxeubt0uhc7bunhoQzni/+549WujOblLWUermT9G95HvmM0N5 ZWH87WC8EvdVm/Vv1VxFpOBSUxlbWeuX6I6SlJh3dLvYEFZuLc/LdrumszB/POLdr589 h/BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711630949; x=1712235749; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ayaIlPzGHo9ojku/ScQV9ilhbecwwZFA0IztSv09FRg=; b=hq7HGqIoJCVhqUsAMmFZnwTHP5IOqlYwwFC0eoxYrAFqxoV8oi/5wn4ZyndJtlOsas FuiJPVisu3nfRxIuQUyCgpyvpYi2t/QNavc1aaYybRZS5TpbpxU820v14rGgYMtAIZZ0 JCH3z4rd0b0Y7JecGbfVFz0gOYpgt0NdWkAIPRlw87srp+nqNKVT8gKBjPJvFBwrPqMx LZaCSP/cKOs6b4pbp1qhOloLM3ekodKUGhWGojWi8hpn8339e+67mh9hqp+ONygBXUMk RcAdFo/ANQiQk6mqtQy3e92TNAYM1UMpeLqlx51nva6tW0g2+2EOoAhQSL6ogKWs7o/C Mbgw== X-Gm-Message-State: AOJu0Yzf8GITEKRhBJNmdg86qXdzH9SiQGpZj1gjAvypFt0wQu/sRNW+ gCtqoKkMksO/384+WmpzjOcG510lJQYMn9BgQGFC6nutdooUvPQXub3vwpKMqLk= X-Google-Smtp-Source: AGHT+IG057GbJzrMv0bGXNUXHVGmconq6F58JMM7ZtFLWfgyIfKVT1ftN29+MXrza01ho5DXzghzOQ== X-Received: by 2002:a05:600c:46cb:b0:414:1023:7262 with SMTP id q11-20020a05600c46cb00b0041410237262mr2871627wmo.19.1711630948943; Thu, 28 Mar 2024 06:02:28 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id h11-20020a05600c314b00b0041490467febsm5404919wmo.38.2024.03.28.06.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Mar 2024 06:02:28 -0700 (PDT) From: Sharlatan Hellseher Date: Thu, 28 Mar 2024 13:02:24 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=sharlatanus@gmail.com; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: fb9549164520ad993c2fbbaedc899844d57baabc 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 ;;; Copyright © 2023, 2024 Jaeme Sifat ;;; Copyright © 2024 Troy Figiel +;;; Copyright © 2024 Sharlatan Hellseher ;;; ;;; 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