From patchwork Thu Mar 14 21:16:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 61830 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 938CC27BBF0; Thu, 14 Mar 2024 21:19:56 +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=ham 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 6C0B227BBE9 for ; Thu, 14 Mar 2024 21:19:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rksTR-0006Yz-3a; Thu, 14 Mar 2024 17:18:49 -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-0006PV-66 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 1rksTD-0004ZS-U9 for guix-patches@gnu.org; Thu, 14 Mar 2024 17:18:35 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rksTn-0005Di-Pv for guix-patches@gnu.org; Thu, 14 Mar 2024 17:19:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69803] [PATCH rust-team 33/37] gnu: Add rust-eframe-0.26. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Mar 2024 21:19:11 +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.171045111319848 (code B ref 69803); Thu, 14 Mar 2024 21:19:11 +0000 Received: (at 69803) by debbugs.gnu.org; 14 Mar 2024 21:18:33 +0000 Received: from localhost ([127.0.0.1]:50872 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rksTA-00059x-Ul for submit@debbugs.gnu.org; Thu, 14 Mar 2024 17:18:33 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59581 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rksSl-00051u-7r for 69803@debbugs.gnu.org; Thu, 14 Mar 2024 17:18:10 -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=OBWiG1Uc42ERytwQB7FFkRfG4MYPYvYbYeY3ZBbyvgA=; b=XoECs4qg8nMFc1eTkyZCJsPA2e0qTBineSC+9YB5lf3HYwaa5+glw49D2Bbf2ZZIEwuAj+ 1L2HTcBZyV1+42lFC7ijW+NMBLES4S5mgpe9HtUyPHcTeg6srAGWQap5g8BRlYGT66MFry RKDDugYgLBV69EGIZgOICtZZdenOUIW2Z9lU8Ve22aVuUar8XA4G1QCccHQuBqMa25fdTV pTjjp+L0FsO71NrdBZ8oD/qjX4IOPTYLz44qBi8GfLP3CMYJ//sMqnt3rKV2MVTZ7LLlEq RLgZHNQGhdvuvuHx2QDwxi9MlpbuvOjQo86D50YUMXsdOzoYW/Rparu+kjBsNQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id a9141e80 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 14 Mar 2024 21:17:09 +0000 (UTC) Date: Thu, 14 Mar 2024 22:16:34 +0100 Message-ID: <20240314211638.6190-33-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-eframe-0.26): Add variable. * gnu/packages/patches/rust-eframe-unix-only.patch: New file. * gnu/local.mk (dist_patch_DATA): Register file. Change-Id: I02104386c91baa2a1a563212af7ccf1507553077 --- gnu/local.mk | 1 + gnu/packages/crates-io.scm | 50 ++++++ .../patches/rust-eframe-unix-only.patch | 152 ++++++++++++++++++ 3 files changed, 203 insertions(+) create mode 100644 gnu/packages/patches/rust-eframe-unix-only.patch diff --git a/gnu/local.mk b/gnu/local.mk index 355889f1b7..2f9fdb675c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2009,6 +2009,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-arboard-2-unix-only.patch \ %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-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 489cde6da2..5ef4f76fe5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20711,6 +20711,56 @@ (define-public rust-editdistancek-1 "This crate provides fast algorithm for computing edit distance.") (license license:expat))) +(define-public rust-eframe-0.26 + (package + (name "rust-eframe") + (version "0.26.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "eframe" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vzjpm6kmqnnyhsvm4gq7yi7033m7mq88x15h2vnigqkdnxw2mn4")) + (patches (search-patches "rust-eframe-unix-only.patch")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bytemuck" ,rust-bytemuck-1) + ("rust-directories-next" ,rust-directories-next-2) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-egui" ,rust-egui-0.26) + ("rust-egui-winit" ,rust-egui-winit-0.26) + ("rust-egui-glow" ,rust-egui-glow-0.26) + ("rust-glow" ,rust-glow-0.13) + ("rust-glutin" ,rust-glutin-0.31) + ("rust-glutin-winit" ,rust-glutin-winit-0.4) + ("rust-image" ,rust-image-0.24) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pollster" ,rust-pollster-0.3) + ("rust-puffin" ,rust-puffin-0.19) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.6) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.5) + ("rust-ron" ,rust-ron-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-static-assertions" ,rust-static-assertions-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-web-sys" ,rust-web-sys-0.3) + ("rust-web-time" ,rust-web-time-0.2) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winit" ,rust-winit-0.29)))) + (home-page "https://github.com/emilk/egui/tree/master/crates/eframe") + (synopsis "Write GUI apps that compile natively and for web") + (description + "This package provides the egui framework: write GUI apps that +compile to web and/or natively.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ego-tree-0.6 (package (name "rust-ego-tree") diff --git a/gnu/packages/patches/rust-eframe-unix-only.patch b/gnu/packages/patches/rust-eframe-unix-only.patch new file mode 100644 index 0000000000..656cbdd0a5 --- /dev/null +++ b/gnu/packages/patches/rust-eframe-unix-only.patch @@ -0,0 +1,152 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 0065f39..c0b3c13 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -115,7 +115,6 @@ default = [ + "default_fonts", + "glow", + "wayland", +- "web_screen_reader", + "winit/default", + "x11", + ] +@@ -139,49 +138,21 @@ puffin = [ + "dep:puffin", + "egui/puffin", + "egui_glow?/puffin", +- "egui-wgpu?/puffin", + "egui-winit/puffin", + ] + wayland = [ + "egui-winit/wayland", +- "egui-wgpu?/wayland", + "egui_glow?/wayland", + ] +-web_screen_reader = [ +- "web-sys/SpeechSynthesis", +- "web-sys/SpeechSynthesisUtterance", +-] +-wgpu = [ +- "dep:wgpu", +- "dep:egui-wgpu", +- "dep:pollster", +-] + x11 = [ + "egui-winit/x11", +- "egui-wgpu?/x11", + "egui_glow?/x11", + ] + +-[target."cfg(any(target_os = \"macos\"))".dependencies.cocoa] +-version = "0.25.0" +- +-[target."cfg(any(target_os = \"macos\"))".dependencies.objc] +-version = "0.2.7" +- +-[target."cfg(any(target_os = \"windows\"))".dependencies.winapi] +-version = "0.3.9" +-features = ["winuser"] +- + [target."cfg(not(target_arch = \"wasm32\"))".dependencies.directories-next] + version = "2" + optional = true + +-[target."cfg(not(target_arch = \"wasm32\"))".dependencies.egui-wgpu] +-version = "0.26.2" +-features = ["winit"] +-optional = true +-default-features = false +- + [target."cfg(not(target_arch = \"wasm32\"))".dependencies.egui-winit] + version = "0.26.2" + features = [ +@@ -211,89 +182,7 @@ optional = true + version = "0.19" + optional = true + +-[target."cfg(not(target_arch = \"wasm32\"))".dependencies.wgpu] +-version = "0.19.1" +-features = [ +- "fragile-send-sync-non-atomic-wasm", +- "metal", +- "webgpu", +-] +-optional = true +-default-features = false +- + [target."cfg(not(target_arch = \"wasm32\"))".dependencies.winit] + version = "0.29.4" + features = ["rwh_06"] + default-features = false +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.bytemuck] +-version = "1.7" +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.egui-wgpu] +-version = "0.26.2" +-optional = true +-default-features = false +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.js-sys] +-version = "0.3" +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.percent-encoding] +-version = "2.1" +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen] +-version = "0.2" +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.wasm-bindgen-futures] +-version = "0.4" +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.web-sys] +-version = "0.3.58" +-features = [ +- "BinaryType", +- "Blob", +- "Clipboard", +- "ClipboardEvent", +- "CompositionEvent", +- "console", +- "CssStyleDeclaration", +- "DataTransfer", +- "DataTransferItem", +- "DataTransferItemList", +- "Document", +- "DomRect", +- "DragEvent", +- "Element", +- "Event", +- "EventListener", +- "EventTarget", +- "ExtSRgb", +- "File", +- "FileList", +- "FocusEvent", +- "HtmlCanvasElement", +- "HtmlElement", +- "HtmlInputElement", +- "InputEvent", +- "KeyboardEvent", +- "Location", +- "MediaQueryList", +- "MediaQueryListEvent", +- "MouseEvent", +- "Navigator", +- "Performance", +- "Storage", +- "Touch", +- "TouchEvent", +- "TouchList", +- "WebGl2RenderingContext", +- "WebglDebugRendererInfo", +- "WebGlRenderingContext", +- "WheelEvent", +- "Window", +-] +- +-[target."cfg(target_arch = \"wasm32\")".dependencies.wgpu] +-version = "0.19.1" +-features = ["fragile-send-sync-non-atomic-wasm"] +-optional = true +-default-features = false