[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69803] [PATCH rust-team 19/37] gnu: Add rust-arboard-2.
From: |
Herman Rimm |
Subject: |
[bug#69803] [PATCH rust-team 19/37] gnu: Add rust-arboard-2. |
Date: |
Thu, 14 Mar 2024 22:16:20 +0100 |
* 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",
+-]
--
2.41.0
- [bug#69803] [PATCH rust-team 22/37] gnu: Add rust-nohash-hasher-0.2., (continued)
- [bug#69803] [PATCH rust-team 22/37] gnu: Add rust-nohash-hasher-0.2., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 20/37] gnu: Add rust-litrs-0.4., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 18/37] gnu: Add rust-x11rb-0.9., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 23/37] gnu: Add rust-puffin-0.19., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 32/37] gnu: Add rust-glutin-winit-0.4., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 36/37] gnu: Add rust-gilrs-core-0.5., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 14/37] gnu: Add rust-accesskit-winit-0.16., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 16/37] gnu: Add rust-wl-clipboard-rs-0.8., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 17/37] gnu: Add rust-arboard-3., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 15/37] gnu: rust-nix-0.26: Update to 0.26.4., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 19/37] gnu: Add rust-arboard-2.,
Herman Rimm <=
- [bug#69803] [PATCH rust-team 30/37] gnu: Add rust-glow-0.13., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 35/37] gnu: Add rust-libudev-sys-0.1., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 31/37] gnu: Add rust-egui-glow-0.26., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 34/37] gnu: Add rust-egui-plot-0.26., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 37/37] gnu: Add rust-gilrs-0.10., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 33/37] gnu: Add rust-eframe-0.26., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 25/37] gnu: Add rust-color-hex-0.2., Herman Rimm, 2024/03/14
- [bug#69803] [PATCH rust-team 29/37] gnu: Add rust-egui-winit-0.26., Herman Rimm, 2024/03/14