From patchwork Thu Mar 14 21:16:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 61832 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 C0E3527BBE9; Thu, 14 Mar 2024 21:19:58 +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 BC84B27BBED 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 1rksTP-0006Wg-0R; 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-0006Nx-Ss 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 1rksT7-0004X1-Pu 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 1rksTh-0005Bu-Lc for guix-patches@gnu.org; Thu, 14 Mar 2024 17:19:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69803] [PATCH rust-team 17/37] gnu: Add rust-arboard-3. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Mar 2024 21:19:05 +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.171045110719737 (code B ref 69803); Thu, 14 Mar 2024 21:19:05 +0000 Received: (at 69803) by debbugs.gnu.org; 14 Mar 2024 21:18:27 +0000 Received: from localhost ([127.0.0.1]:50842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rksT5-00058B-97 for submit@debbugs.gnu.org; Thu, 14 Mar 2024 17:18:27 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:44669 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rksSf-00051X-AO 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=zGjFqzePH3l1KXNPXVj6eNk0t2fHQmOEdnU3dNjv7/4=; b=O7m5lnx205HSuhrkUzmYVwrqJBMTA5/bRfODUMzJDNpdazlbvjUjCrYK6r5y7Rcku9Blac iIvWokFi7w66T/s9mbp2bYAUghkzCxdL4H3I/HYIPYaIY8O+MXAv9RK8fzY1AabR78SpQp jW+X0WREaflwZW9b9EHHaBzQcEB6OKCWVjrluubf8kyyVSSz3GPxXCf93bHgCeyCFTvv6t FuKhW451prAMlYQkfORIjWMiJP56M/0ZZYiRv15RQBqAyLqXklhcvzy6RTGiPfev9aS9ho EAASogPEfKuFMOllZojMor6GSHtOBJ0kiyTdfV8uxXVbXliVR+eOpczQTzgG0g== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 88774c77 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Thu, 14 Mar 2024 21:17:06 +0000 (UTC) Date: Thu, 14 Mar 2024 22:16:18 +0100 Message-ID: <20240314211638.6190-17-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-3): Add variable. (rust-arboard-1): Inherit from rust-arboard-3. * gnu/packages/patches/rust-arboard-3-unix-only.patch: New file. * gnu/local.mk (dist_patch_DATA): Register file. Change-Id: Ic5081f9cd6b8d63e033ca2a2c8d2f779758f0694 --- gnu/local.mk | 1 + gnu/packages/crates-io.scm | 38 ++++++++++--- .../patches/rust-arboard-3-unix-only.patch | 54 +++++++++++++++++++ 3 files changed, 87 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/rust-arboard-3-unix-only.patch diff --git a/gnu/local.mk b/gnu/local.mk index 503122d2aa..731a4799b4 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-3-unix-only.patch \ %D%/packages/patches/rust-cargo-edit-remove-ureq.patch \ %D%/packages/patches/rust-ring-0.17-ring-core.patch \ %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2cca202f57..90d7e17e3b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2132,8 +2132,39 @@ (define-public rust-arbitrary-0.4 #:cargo-inputs (("rust-derive-arbitrary" ,rust-derive-arbitrary-0.4)))))) +(define-public rust-arboard-3 + (package + (name "rust-arboard") + (version "3.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "arboard" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02iqwp8zv41a1vmxr41s0ghb40rf58b5vnl5mzxxcgcs7mrkrahz")) + (patches (search-patches "rust-arboard-3-unix-only.patch")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; $DISPLAY variable not set + #:cargo-inputs (("rust-image" ,rust-image-0.24) + ("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.8) + ("rust-x11rb" ,rust-x11rb-0.13)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.9)))) + (home-page "https://github.com/1Password/arboard") + (synopsis "Image and text handling for the OS clipboard") + (description + "This package provides image and text handling for the OS +clipboard.") + (license (list license:expat license:asl2.0)))) + (define-public rust-arboard-1 (package + (inherit rust-arboard-3) (name "rust-arboard") (version "1.2.1") (source @@ -2165,12 +2196,7 @@ (define-public rust-arboard-1 ("rust-x11rb" ,rust-x11rb-0.8)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.8) - ("rust-simple-logger" ,rust-simple-logger-1)))) - (home-page "https://github.com/ArturKovacs/arboard") - (synopsis "Image and text handling for the OS clipboard") - (description - "This package provides image and text handling for the OS clipboard.") - (license (list license:expat license:asl2.0)))) + ("rust-simple-logger" ,rust-simple-logger-1)))))) (define-public rust-arc-swap-1 (package diff --git a/gnu/packages/patches/rust-arboard-3-unix-only.patch b/gnu/packages/patches/rust-arboard-3-unix-only.patch new file mode 100644 index 0000000000..02efc21928 --- /dev/null +++ b/gnu/packages/patches/rust-arboard-3-unix-only.patch @@ -0,0 +1,54 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 1921528..2f45618 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -45,9 +45,7 @@ version = "0.9.0" + [features] + default = ["image-data"] + image-data = [ +- "core-graphics", + "image", +- "windows-sys", + ] + wayland-data-control = ["wl-clipboard-rs"] + +@@ -69,39 +67,3 @@ optional = true + + [target."cfg(all(unix, not(any(target_os=\"macos\", target_os=\"android\", target_os=\"emscripten\"))))".dependencies.x11rb] + version = "0.13" +- +-[target."cfg(target_os = \"macos\")".dependencies.core-graphics] +-version = "0.23" +-optional = true +- +-[target."cfg(target_os = \"macos\")".dependencies.image] +-version = "0.24" +-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 = "5.0.0" +- +-[target."cfg(windows)".dependencies.log] +-version = "0.4" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48.0" +-features = [ +- "Win32_Foundation", +- "Win32_Graphics_Gdi", +- "Win32_System_DataExchange", +- "Win32_System_Memory", +- "Win32_System_Ole", +-] +-optional = true