From patchwork Tue Nov 9 21:22:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34366 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 0E57E27BBE3; Tue, 9 Nov 2021 21:23:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 73C9B27BBE1 for ; Tue, 9 Nov 2021 21:23:13 +0000 (GMT) Received: from localhost ([::1]:57224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mkYaF-0006go-Ku for patchwork@mira.cbaines.net; Tue, 09 Nov 2021 16:23:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkYa6-0006cA-UO for guix-patches@gnu.org; Tue, 09 Nov 2021 16:23:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52764) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mkYa6-0002Hj-M2 for guix-patches@gnu.org; Tue, 09 Nov 2021 16:23:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mkYa6-0004o7-Is for guix-patches@gnu.org; Tue, 09 Nov 2021 16:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51730] [PATCH 19/21] gnu: Add rust-wl-clipboard-rs-0.4. References: In-Reply-To: Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Nov 2021 21:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51730 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "51730@debbugs.gnu.org" <51730@debbugs.gnu.org> Received: via spool by 51730-submit@debbugs.gnu.org id=B51730.163649293818382 (code B ref 51730); Tue, 09 Nov 2021 21:23:02 +0000 Received: (at 51730) by debbugs.gnu.org; 9 Nov 2021 21:22:18 +0000 Received: from localhost ([127.0.0.1]:36070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkYZO-0004mL-18 for submit@debbugs.gnu.org; Tue, 09 Nov 2021 16:22:18 -0500 Received: from mail-4316.protonmail.ch ([185.70.43.16]:55343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkYZM-0004m8-IY for 51730@debbugs.gnu.org; Tue, 09 Nov 2021 16:22:16 -0500 Date: Tue, 09 Nov 2021 21:22:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1636492930; bh=ZqeHvgbNB0JAiD2PjnjBUMRtHZTqhVSmw9oB5HaDVXc=; h=Date:To:From:Reply-To:Subject:From; b=I8lFHn8aVToXss+l7gHVZvpZmplNoXx6z5KAgBL/djVzP6ZRcQ4dbRV+2KpfnufAY xCRJNDVxOpe66VQ4u4RiGna6iFdNPJeGxdHSLOtDZk4/08tIyHHtPvaFyksZrkw5/x lKeOfL3g+Lz770VrCMYF8ks1bKjAPMM7unIMrda8= Message-ID: <2UFj5ObV9BKYbYJelqG8tpNRfk2ydikShOoje77XlKyAGsGoiPiiAFRUOl89abm33GcBBeb3SDuj0edL0KDW2LFhblcpI1zjCV2W8jzKB-U=@protonmail.com> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-graphics.scm (rust-wl-clipboard-rs-0.4): New variable. * gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch: New file. * gnu/local.mk: Add patch. --- 2.33.1 diff --git a/gnu/local.mk b/gnu/local.mk index 05258ac054..01a82248f1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1760,6 +1760,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-reproducible-builds.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ + %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-burgled-batteries3-fix-signals.patch\ %D%/packages/patches/sbcl-clml-fix-types.patch \ diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index d50056e948..a1ea11416c 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2402,6 +2402,44 @@ (define-public rust-wayland-client-0.21 (("rust-byteorder" ,rust-byteorder-1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-wl-clipboard-rs-0.4 + (package + (name "rust-wl-clipboard-rs") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "wl-clipboard-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (patches (search-patches "rust-wl-clipboard-rs-newer-wl.patch")) + (sha256 + (base32 "1252cm67pkrr6ik5ys2cdyfr2zzw6ds7v351i1cmyi94yiv01l13")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-derive-new" ,rust-derive-new-0.5) + ("rust-derive-more" ,rust-derive-more-0.99) + ("rust-exitfailure" ,rust-exitfailure-0.5) + ("rust-failure" ,rust-failure-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-nix" ,rust-nix-0.18) + ("rust-os-pipe" ,rust-os-pipe-0.9) + ("rust-stderrlog" ,rust-stderrlog-0.4) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-tree-magic" ,rust-tree-magic-0.2) + ("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-wayland-commons" ,rust-wayland-commons-0.28) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.28)))) + (home-page "https://github.com/YaLTeR/wl-clipboard-rs") + (synopsis "Access to the Wayland clipboard") + (description "This package provides access to the Wayland clipboard +for terminal and other window-less applications.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wayland-commons-0.28 (package (name "rust-wayland-commons") diff --git a/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch b/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch new file mode 100644 index 0000000000..9fb692e9a6 --- /dev/null +++ b/gnu/packages/patches/rust-wl-clipboard-rs-newer-wl.patch @@ -0,0 +1,26 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 7b975e0..313cb63 100644 +--- a/Cargo.toml ++++ b/Cargo.toml.new +@@ -75,17 +75,17 @@ version = "3" + version = "0.2" + + [dependencies.wayland-client] +-version = "0.27" ++version = "0.28" + + [dependencies.wayland-protocols] +-version = "0.27" ++version = "0.28" + features = ["client", "unstable_protocols"] + [dev-dependencies.wayland-protocols] +-version = "0.27" ++version = "0.28" + features = ["server", "unstable_protocols"] + + [dev-dependencies.wayland-server] +-version = "0.27" ++version = "0.28" + + [features] + dlopen = ["native_lib", "wayland-client/dlopen", "wayland-server/dlopen"]