From patchwork Sun May 7 13:26:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 49852 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 2B36527BBEA; Sun, 7 May 2023 14:28:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 CF07227BBE2 for ; Sun, 7 May 2023 14:28:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pveQm-0001Oc-G2; Sun, 07 May 2023 09:28:04 -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 1pveQl-0001OD-IK for guix-patches@gnu.org; Sun, 07 May 2023 09:28:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pveQl-00011w-AQ for guix-patches@gnu.org; Sun, 07 May 2023 09:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pveQl-00057k-5r for guix-patches@gnu.org; Sun, 07 May 2023 09:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63348] [PATCH 3/4] gnu: Add rust-webbrowser-0.8. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 May 2023 13:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63348 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63348@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 63348-submit@debbugs.gnu.org id=B63348.168346603919611 (code B ref 63348); Sun, 07 May 2023 13:28:03 +0000 Received: (at 63348) by debbugs.gnu.org; 7 May 2023 13:27:19 +0000 Received: from localhost ([127.0.0.1]:36713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pveQ2-00056F-Em for submit@debbugs.gnu.org; Sun, 07 May 2023 09:27:18 -0400 Received: from mout.gmx.net ([212.227.17.22]:53333) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pveQ0-00055n-GW for 63348@debbugs.gnu.org; Sun, 07 May 2023 09:27:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.com; s=s31663417; t=1683466030; i=pierre.langlois@gmx.com; bh=fwYIypa5LmABw7t9QTTOXGphjblUlcbkhqs1d92Mt7c=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=XIbdL10TYu6ZxVp5GgyG3Tu5aXQ9gbnms26chSrnscnvNx41hGZ8Vtj5k73A8F+F7 nAvkgHBBgaUA26oN843Uw6X6XAkHtpIf8qWAsXqcVz9E2DhlYayC40gdJ94X0uNc1I e6w/QYXP73FcyUUOjYMuu86IJ5mmDoGgFm4sZDHs2bylQsolRm/Q+QyMcTfLifTTF4 K7ZQHRGurZdiB54Zz/7MOwRN24ajCtym97DBNipZ8JBPP4zLc4mR5+nbSklG9qYRCL PYIO2hJk6Z87QMesVBMQ4prqxmJWZBXBq6xlYxCdzmKm26BPlNmMwwwYERPaC9kk5S tGdSfAJ1PCsAA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MuUjC-1qCd6S34Jm-00rZ1H; Sun, 07 May 2023 15:27:10 +0200 From: Pierre Langlois Date: Sun, 7 May 2023 14:26:21 +0100 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:Wbp/3dEx0QEDD4zb2A48cYeREoCExBaAi8I8VAs8xbjhUeqcw+2 I3CqTv1uPgrFAJc85Ult0R/HU71n/Uhk1GK9PuizbRkEwNcYFJRVvwopKi57bHbdJ5sbcfr G0YMyaK5gONFEh7AOaqPUjnOhEbfN53oPnRyAG9U4HSUZFq2UgiFu8N4tUtsjmWEy06AUX2 wFoYASTQ6mDGb5+GnE6dg== UI-OutboundReport: notjunk:1;M01:P0:/KpxlAfwhKo=;GW3GvJlfHlZXA5XlSZ/QhyJrHA/ LKYZSlWFivS8usdPE0ER2plcFsWcN8Hut2fXymFG7Xkw2ZOW4P0i0Vwvi2hCo31y/+NQjWvia quP+AJZo7iwIRy+Ut2QSC/R/RmxPO6w+gSTmOlDjnNGnGt4BCNE5OscKmQuQT1eqfuedPdn7j r5JUBRi8PezH8aoqikdlqoyZA0muR24NbpCGadSajnzOewkhiI6gDaS68V9sRs4g8nXvHuDN4 eKFhvP+BH4iRBLqZnFQBVUI5mRnFBmuxU3Ixzp/mpTRT0cA9Cp1mEVK+EY9iJf0/IMN6PlIv1 MVFC4MRSd9Ie/cfsV7DbfiMO3xSiEXq4NXJKB/cpFhRycMWnuttv9Z2T6DJrGmz3mVA6EKhJW l/79XCf52GxJcx+kAZNYAcIh1Y7lTVQIwIXBt8UtAzaVYq/eXCs8hq1oUfrN12FBYkNmIMHE6 DM8HO1YdkX03Ui4T0fa/+6JFby4drWOKLX1ShEoLKRjWAgyk/UVKnz2OEY7XQV2pKp8knlrIM EDZJadzwNltuQuieZmzUMm1V0FuXbJRBiW8DUAsImeqTM6HDPsaWRZID6M9eR0IMd4rDv5qXi huC8iff7qUO5sZTlUGXY2erVpc70AOb8l7w8asrcj5LP1bGDhx4tj1ev/MG066NkNxtYJ/nzt 0Psx1bwvutCpTqitlz61LMFRxgJG/lwjAjG9zH1TjnJI4+i9KEX3yMWZJAwEj8ltpKP67l0tf pc06WUriX2ydBllsTXe4V66SblB2btqCIXbl+ICE0dFfUeLEfZvMwwqb8pxMXJhfDVQTX1sVr hURX1AATx0U2wqwQg363Di55KHC+v1uwg+tbxpPifnsHqw+vBV1z+9SMbzq7Y0aTyPy92yRfm OWfCTY+LYVKghIDFszbPWp5NTjo8LV9aFDe6yzUP2kTGZjoNbvpu1SHA32qeQPM/uemZzyvkG 8CfUK4doVoYbWCV5Tkjy08Gh27M= 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-webbrowser-0.8): New variable. (rust-webbrowser-0.5): Inherit from rust-webbrowser-0.8. * gnu/packages/patches/rust-webbrowser-remove-unsupported-os.patch: New file. * gnu/local.mk: Register it. --- gnu/local.mk | 1 + gnu/packages/crates-io.scm | 39 +++++++++++++++---- ...ust-webbrowser-remove-unsupported-os.patch | 24 ++++++++++++ 3 files changed, 56 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/rust-webbrowser-remove-unsupported-os.patch -- 2.39.2 diff --git a/gnu/local.mk b/gnu/local.mk index de5ac37ba5..cda612274a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1872,6 +1872,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-nettle-sys-disable-vendor.patch \ %D%/packages/patches/rust-openssl-sys-no-vendor.patch \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ + %D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch \ %D%/packages/patches/rw-igraph-0.10.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 22eeceb2fc..d912441f4d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -67832,8 +67832,38 @@ (define-public rust-web-sys-0.3 "Bindings for all Web APIs, a procedurally generated crate from WebIDL.") (license (list license:expat license:asl2.0)))) +(define-public rust-webbrowser-0.8 + (package + (name "rust-webbrowser") + (version "0.8.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "webbrowser" version)) + (file-name (string-append name "-" version ".tar.gz")) + ;; Explicitely remove dependencies for unsupported operating systems, + ;; to avoid pulling many dependencies and causing rust world rebuilds. + (patches (search-patches "rust-webbrowser-remove-unsupported-os.patch")) + (patch-flags '("-p0")) + (sha256 + (base32 "0zk1qidyksspa8pgvq8bh2lyqmmrs0fr5r1qsyhbzrawpn2w972p")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-dirs" ,rust-dirs-4) + ("rust-log" ,rust-log-0.4) + ("rust-url" ,rust-url-2) + ("rust-web-sys" ,rust-web-sys-0.3)))) + (home-page "https://github.com/amodm/webbrowser-rs") + (synopsis "Open URLs in web browsers available on a platform") + (description + "Webbrowser-rs is a Rust library to open URLs in the web browsers +available on a platform.") + (license (list license:expat license:asl2.0)))) + (define-public rust-webbrowser-0.5 (package + (inherit rust-webbrowser-0.8) (name "rust-webbrowser") (version "0.5.5") (source @@ -67849,14 +67879,7 @@ (define-public rust-webbrowser-0.5 #:cargo-inputs (("rust-web-sys" ,rust-web-sys-0.3) ("rust-widestring" ,rust-widestring-0.4) - ("rust-winapi" ,rust-winapi-0.3)))) - (home-page - "https://github.com/amodm/webbrowser-rs") - (synopsis "Open URLs in web browsers available on a platform") - (description - "Webbrowser-rs is a Rust library to open URLs in the web browsers -available on a platform.") - (license (list license:expat license:asl2.0)))) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-webpki-0.22 (package diff --git a/gnu/packages/patches/rust-webbrowser-remove-unsupported-os.patch b/gnu/packages/patches/rust-webbrowser-remove-unsupported-os.patch new file mode 100644 index 0000000000..9fea1e1665 --- /dev/null +++ b/gnu/packages/patches/rust-webbrowser-remove-unsupported-os.patch @@ -0,0 +1,24 @@ +--- Cargo.toml 2023-05-07 13:39:13.029066693 +0100 ++++ Cargo.toml 2023-05-07 13:39:22.545138206 +0100 +@@ -67,21 +67,3 @@ + [target."cfg(target_arch = \"wasm32\")".dependencies.web-sys] + version = "0.3" + features = ["Window"] +- +-[target."cfg(target_os = \"android\")".dependencies.jni] +-version = "0.21" +- +-[target."cfg(target_os = \"android\")".dependencies.ndk-context] +-version = "0.1" +- +-[target."cfg(target_os = \"android\")".dev-dependencies.ndk-glue] +-version = ">= 0.3, <= 0.7" +- +-[target."cfg(target_os = \"ios\")".dependencies.objc] +-version = "0.2.7" +- +-[target."cfg(target_os = \"ios\")".dependencies.raw-window-handle] +-version = "0.5.0" +- +-[target."cfg(target_os = \"macos\")".dependencies.core-foundation] +-version = "0.9"