From 47b77ec60d58ea8a6a53a96f4a720a4b91e24bee Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Fri, 14 Jul 2023 21:46:15 -0400 Subject: [PATCH] taplo: update to 0.8.1 --- .../0001-handle-lsp-shutdown-request.patch | 26 ------------------- srcpkgs/taplo/patches/update-pprof.patch | 14 ++++++++++ srcpkgs/taplo/template | 14 ++++++---- 3 files changed, 23 insertions(+), 31 deletions(-) delete mode 100644 srcpkgs/taplo/patches/0001-handle-lsp-shutdown-request.patch create mode 100644 srcpkgs/taplo/patches/update-pprof.patch diff --git a/srcpkgs/taplo/patches/0001-handle-lsp-shutdown-request.patch b/srcpkgs/taplo/patches/0001-handle-lsp-shutdown-request.patch deleted file mode 100644 index 9abf3fd25eaa..000000000000 --- a/srcpkgs/taplo/patches/0001-handle-lsp-shutdown-request.patch +++ /dev/null @@ -1,26 +0,0 @@ -From https://github.com/tamasfe/taplo/pull/354 -From: Michael Davis -Date: Sun, 20 Nov 2022 12:25:43 -0600 -Subject: [PATCH] Handle LSP shutdown request - -These lines in the Server loop discard any messages with the shutdown -method. The Server can handle and correctly respond to shutdown -requests, though, so there's no need to discard the message. ---- - crates/lsp-async-stub/src/listen.rs | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/crates/lsp-async-stub/src/listen.rs b/crates/lsp-async-stub/src/listen.rs -index fca0a2980..b6b00f5fd 100644 ---- a/crates/lsp-async-stub/src/listen.rs -+++ b/crates/lsp-async-stub/src/listen.rs -@@ -64,8 +64,6 @@ impl Server { - drop(output); - drop(input); - break; -- } else if msg.method.as_ref().map(|m| m == "shutdown").unwrap_or(false) { -- continue; - } - - let task_fut = self.handle_message( - diff --git a/srcpkgs/taplo/patches/update-pprof.patch b/srcpkgs/taplo/patches/update-pprof.patch new file mode 100644 index 000000000000..f0abc5d6bb8a --- /dev/null +++ b/srcpkgs/taplo/patches/update-pprof.patch @@ -0,0 +1,14 @@ +# old version does not have all features needed for checks on i686 +diff --git a/crates/taplo/Cargo.toml b/crates/taplo/Cargo.toml +index 966ba1db30..7912352478 100644 +--- a/crates/taplo/Cargo.toml ++++ b/crates/taplo/Cargo.toml +@@ -36,7 +36,7 @@ serde = { version = "1", features = ["derive"], optional = true } + assert-json-diff = "2" + criterion = "0.3" + difference = "2.0.0" +-pprof = { version = "0.9.1", features = ["flamegraph", "criterion"] } ++pprof = { version = "0.12.0", features = ["flamegraph", "criterion"] } + serde_json = "1" + toml = "0.5" + diff --git a/srcpkgs/taplo/template b/srcpkgs/taplo/template index 84e86a6c4c3e..1db177886e25 100644 --- a/srcpkgs/taplo/template +++ b/srcpkgs/taplo/template @@ -1,13 +1,13 @@ # Template file for 'taplo' pkgname=taplo -version=0.8.0 -revision=2 -build_wrksrc="crates/taplo-cli" +version=0.8.1 +revision=1 build_style=cargo # no-default-features: allows selecting custom feature set # lsp: builds TOML language server # native-tls: Enables linking against system SSL instead of rustls/ring configure_args="--no-default-features --features lsp,native-tls" +make_install_args="--path crates/taplo-cli" hostmakedepends="pkg-config" makedepends="openssl-devel" short_desc="TOML toolkit written in Rust" @@ -15,8 +15,12 @@ maintainer="cinerea0 " license="MIT" homepage="https://taplo.tamasfe.dev/" distfiles="https://github.com/tamasfe/taplo/archive/refs/tags/${version}.tar.gz" -checksum=079fab82f48e4f71379f0d2e249b7bd402af8ddf84ea16b65ba2742811a8d951 +checksum=ec8dfdcfa33a6855803286413c0603140b21c06bc659ceab7e2ddc05baf1a8b3 + +post_patch() { + cargo update --package pprof@0.9.1 --precise 0.12.0 +} post_install() { - vlicense ../../LICENSE.md + vlicense LICENSE.md }