From: cinerea0 <cinerea0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] taplo: update to 0.8.1
Date: Sat, 15 Jul 2023 03:46:33 +0200 [thread overview]
Message-ID: <20230715014633.cOcQ-fmF_yCWfYWcZrX0ril_bJXSisx8wfbqWrGjnyY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44974@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
There is an updated pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages taplo
https://github.com/void-linux/void-packages/pull/44974
taplo: update to 0.8.1
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/44974.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taplo-44974.patch --]
[-- Type: text/x-diff, Size: 4027 bytes --]
From 47b77ec60d58ea8a6a53a96f4a720a4b91e24bee Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
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 <mcarsondavis@gmail.com>
-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<W: Clone + 'static> Server<W> {
- 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 <cinerea0@protonmail.com>"
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
}
next prev parent reply other threads:[~2023-07-15 1:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-10 20:30 [PR PATCH] " cinerea0
2023-07-15 1:46 ` cinerea0 [this message]
2023-07-15 5:55 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230715014633.cOcQ-fmF_yCWfYWcZrX0ril_bJXSisx8wfbqWrGjnyY@z \
--to=cinerea0@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).