From patchwork Thu Mar 14 21:16:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 61827 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 1A01E27BBEB; Thu, 14 Mar 2024 21:19:46 +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_INVALID, DKIM_SIGNED,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 A8E9527BBEC for ; Thu, 14 Mar 2024 21:19:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rksTN-0006VE-Db; Thu, 14 Mar 2024 17:18:45 -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 1rksTE-0006Pa-IR for guix-patches@gnu.org; Thu, 14 Mar 2024 17:18:37 -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 1rksTE-0004ZX-AB for guix-patches@gnu.org; Thu, 14 Mar 2024 17:18:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rksTo-0005Dp-6E for guix-patches@gnu.org; Thu, 14 Mar 2024 17:19:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69803] [PATCH rust-team 36/37] gnu: Add rust-gilrs-core-0.5. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Mar 2024 21:19:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69803 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69803@debbugs.gnu.org Cc: Herman Rimm Received: via spool by 69803-submit@debbugs.gnu.org id=B69803.171045111419855 (code B ref 69803); Thu, 14 Mar 2024 21:19:12 +0000 Received: (at 69803) by debbugs.gnu.org; 14 Mar 2024 21:18:34 +0000 Received: from localhost ([127.0.0.1]:50874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rksTB-0005A4-J3 for submit@debbugs.gnu.org; Thu, 14 Mar 2024 17:18:34 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:38137 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rksSm-00051J-Cu for 69803@debbugs.gnu.org; Thu, 14 Mar 2024 17:18:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1710451029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qf08sFfEau4ZW1HeGrUBmjeWBj/k17HIXzqQMoLs1+s=; b=WZSeku5gru1lWrLQRPR14l9NGYKyQNXV4Uav3NqHuEB4HuJ4cY7txigsnwDb327CnvpPj6 vzjyQP+Byq//TNRE7qNsJeGXbbkXdHxoI0BEqnp337RKLC0HwS4n5O7JqO83114q7EHvl5 juE2OJqOb+ylhKl3LX/bYM1yOaxVpxaX8uHzAwtSYkr7jUw1y81D3rKoXv2sX4zRCxhTBa 8aCZjvRuh5PsdoxRogn37tFw0Guggxr0KofReW69htkZgvUSUo9MAeHAGcF7uur/CThghJ ZfaAwduYFzy0v7xIKSPVNFvtjAzpootG7TRaImK+VPF16LyfvmmS4TmB7ftmgQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 3acc694c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 14 Mar 2024 21:17:09 +0000 (UTC) Date: Thu, 14 Mar 2024 22:16:37 +0100 Message-ID: <20240314211638.6190-36-herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240314211638.6190-1-herman@rimm.ee> References: <20240314211638.6190-1-herman@rimm.ee> MIME-Version: 1.0 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 * gnu/packages/crates-io.scm (rust-gilrs-core-0.5): Add variable. * gnu/packages/patches/rust-gilrs-core-unix-only.patch: New file. * gnu/local.mk (dist_patch_DATA): Register file. Change-Id: I791d20d9d83f0d7ff6569b3d82314a72e4656a30 --- gnu/local.mk | 1 + gnu/packages/crates-io.scm | 37 ++++++++++++ .../patches/rust-gilrs-core-unix-only.patch | 57 +++++++++++++++++++ 3 files changed, 95 insertions(+) create mode 100644 gnu/packages/patches/rust-gilrs-core-unix-only.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2f9fdb675c..78d104ff08 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2010,6 +2010,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-arboard-3-unix-only.patch \ %D%/packages/patches/rust-cargo-edit-remove-ureq.patch \ %D%/packages/patches/rust-eframe-unix-only.patch \ + %D%/packages/patches/rust-gilrs-core-unix-only.patch \ %D%/packages/patches/rust-ring-0.17-ring-core.patch \ %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \ %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bfbc5f63e6..930b61a4a8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27208,6 +27208,43 @@ (define-public rust-ghost-0.1 ;; Either license can be chosen at the users option. (license (list license:expat license:asl2.0)))) +(define-public rust-gilrs-core-0.5 + (package + (name "rust-gilrs-core") + (version "0.5.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "gilrs-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0nlc1qx1819hi28zyqgv6cjw2r0dxarw217819s6vwyjgmxq5w8a")) + (patches (search-patches "rust-gilrs-core-unix-only.patch")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-inotify" ,rust-inotify-0.10) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-libudev-sys" ,rust-libudev-sys-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.27) + ("rust-serde" ,rust-serde-1) + ("rust-uuid" ,rust-uuid-1) + ("rust-vec-map" ,rust-vec-map-0.8) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-web-sys" ,rust-web-sys-0.3) + ("rust-windows" ,rust-windows-0.44)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.10)))) + (native-inputs (list pkg-config)) + (inputs (list eudev)) + (home-page "https://gitlab.com/gilrs-project/gilrs") + (synopsis "Event based abstraction for working with gamepads") + (description + "This package provides a minimal event based abstraction for +working with gamepads.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-gimli-0.27 (package (name "rust-gimli") diff --git a/gnu/packages/patches/rust-gilrs-core-unix-only.patch b/gnu/packages/patches/rust-gilrs-core-unix-only.patch new file mode 100644 index 0000000000..767693f4e3 --- /dev/null +++ b/gnu/packages/patches/rust-gilrs-core-unix-only.patch @@ -0,0 +1,57 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 4065497..d5ac0cf 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -48,10 +48,6 @@ version = "0.10.0" + default = ["wgi"] + serde-serialize = ["serde"] + wgi = ["windows"] +-xinput = [ +- "rusty-xinput", +- "winapi", +-] + + [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\"))".dependencies.inotify] + version = "0.10.2" +@@ -74,41 +70,6 @@ default-features = false + [target."cfg(any(target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\"))".dependencies.vec_map] + version = "0.8" + +-[target."cfg(target_arch = \"wasm32\")".dependencies.js-sys] +-version = "0.3" +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen] +-version = "0.2" +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.web-sys] +-version = "0.3" +-features = [ +- "Gamepad", +- "GamepadButton", +- "GamepadMappingType", +- "Window", +- "Navigator", +- "DomException", +-] +- +-[target."cfg(target_os = \"macos\")".dependencies.core-foundation] +-version = "0.9.3" +- +-[target."cfg(target_os = \"macos\")".dependencies.io-kit-sys] +-version = "0.4.0" +- +-[target."cfg(target_os = \"macos\")".dependencies.vec_map] +-version = "0.8" +- +-[target."cfg(target_os = \"windows\")".dependencies.rusty-xinput] +-version = "1.2.0" +-optional = true +- +-[target."cfg(target_os = \"windows\")".dependencies.winapi] +-version = "0.3.4" +-features = ["xinput"] +-optional = true +- + [target."cfg(target_os = \"windows\")".dependencies.windows] + version = ">=0.44, <=0.52" + features = [