From patchwork Thu Mar 14 21:16:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 61835 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 E0EA927BBEA; Thu, 14 Mar 2024 21:20:05 +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 D500427BBE9 for ; Thu, 14 Mar 2024 21:20:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rksTP-0006X7-98; Thu, 14 Mar 2024 17:18:47 -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 1rksTA-0006Nz-TM for guix-patches@gnu.org; Thu, 14 Mar 2024 17:18:33 -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 1rksT8-0004X4-5f for guix-patches@gnu.org; Thu, 14 Mar 2024 17:18:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rksTi-0005C2-1c for guix-patches@gnu.org; Thu, 14 Mar 2024 17:19:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69803] [PATCH rust-team 19/37] gnu: Add rust-arboard-2. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Mar 2024 21:19:06 +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.171045110819745 (code B ref 69803); Thu, 14 Mar 2024 21:19:06 +0000 Received: (at 69803) by debbugs.gnu.org; 14 Mar 2024 21:18:28 +0000 Received: from localhost ([127.0.0.1]:50844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rksT5-00058I-Pi for submit@debbugs.gnu.org; Thu, 14 Mar 2024 17:18:28 -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 1rksSf-00051u-Ml for 69803@debbugs.gnu.org; Thu, 14 Mar 2024 17:18:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1710451026; 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=Wl8G6WJlIfXt83OfxD6TtpbfiSykjizY3VnyqDFU5NM=; b=qLhuFG3yRH5QABEluZbPV8teXm6FIIt0tVtxri0QYAUOuNw/x5VNW6N9M92WPxd6gYnNYp xmUSk9hwNNXFnFlGvujbuIdUSdLYfdUarFeA0uLHLUSpIlnPxhwJCHPycoYNdAYxPhadSA 3iYoW9rgEztvYEFa26xy5z1Xg874IGgOWRIL7hXhlGqAkvVe2jCpqNVulHaXeQS0pILZK/ 7db0PT5d30SY5msM9CasQpnLV29JweBKOlqVfD9xrbvwDCrNfA4jzbqoBcn7EgV9/V7lkR QmbM0/LY8YmDY74gHShg4yJMybgxisiK0J0D57pO2kM1//VSFpnbdmS/EX++Yw== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 4b8718c7 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 14 Mar 2024 21:17:06 +0000 (UTC) Date: Thu, 14 Mar 2024 22:16:20 +0100 Message-ID: <20240314211638.6190-19-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-arboard-2): Add variable. * gnu/packages/patches/rust-arboard-2-unix-only.patch: New file. * gnu/local.mk (dist_patch_DATA): Register file. Change-Id: I0ed9d713e3bcc2c60032513e04cd9ae985b3c387 --- gnu/local.mk | 1 + gnu/packages/crates-io.scm | 27 ++++++++++ .../patches/rust-arboard-2-unix-only.patch | 53 +++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 gnu/packages/patches/rust-arboard-2-unix-only.patch diff --git a/gnu/local.mk b/gnu/local.mk index 731a4799b4..355889f1b7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2006,6 +2006,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch \ %D%/packages/patches/rust-1.70-fix-rustix-build.patch \ %D%/packages/patches/rust-accesskit-winit-unix-only.patch \ + %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-ring-0.17-ring-core.patch \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 90d7e17e3b..580209c281 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2162,6 +2162,33 @@ (define-public rust-arboard-3 clipboard.") (license (list license:expat license:asl2.0)))) +(define-public rust-arboard-2 + (package + (inherit rust-arboard-3) + (name "rust-arboard") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "arboard" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1fq8gqbvajjmxdbd65aygf9ramgpvq1bcxj8mxx6vv5ms5a064nw")) + (patches (search-patches "rust-arboard-2-unix-only.patch")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; error while interacting with clipboard + #:cargo-inputs + (("rust-image" ,rust-image-0.23) + ("rust-log" ,rust-log-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-wl-clipboard-rs" ,rust-wl-clipboard-rs-0.4) + ("rust-x11rb" ,rust-x11rb-0.9)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.9) + ("rust-simple-logger" ,rust-simple-logger-2)))))) + (define-public rust-arboard-1 (package (inherit rust-arboard-3) diff --git a/gnu/packages/patches/rust-arboard-2-unix-only.patch b/gnu/packages/patches/rust-arboard-2-unix-only.patch new file mode 100644 index 0000000000..59141cdce9 --- /dev/null +++ b/gnu/packages/patches/rust-arboard-2-unix-only.patch @@ -0,0 +1,53 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 1d3f38d..7661aad 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -47,11 +47,7 @@ version = "2.1" + [features] + default = ["image-data"] + image-data = [ +- "core-graphics", + "image", +- "winapi/minwindef", +- "winapi/wingdi", +- "winapi/winnt", + ] + wayland-data-control = ["wl-clipboard-rs"] + +@@ -73,36 +69,3 @@ optional = true + + [target."cfg(all(unix, not(any(target_os=\"macos\", target_os=\"android\", target_os=\"emscripten\"))))".dependencies.x11rb] + version = "0.9" +- +-[target."cfg(target_os = \"macos\")".dependencies.core-graphics] +-version = "0.22" +-optional = true +- +-[target."cfg(target_os = \"macos\")".dependencies.image] +-version = "0.23" +-features = ["tiff"] +-optional = true +-default-features = false +- +-[target."cfg(target_os = \"macos\")".dependencies.objc] +-version = "0.2" +- +-[target."cfg(target_os = \"macos\")".dependencies.objc-foundation] +-version = "0.1" +- +-[target."cfg(target_os = \"macos\")".dependencies.objc_id] +-version = "0.1" +- +-[target."cfg(windows)".dependencies.clipboard-win] +-version = "4.2" +- +-[target."cfg(windows)".dependencies.log] +-version = "0.4" +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.9" +-features = [ +- "basetsd", +- "winuser", +- "winbase", +-]