From 4a759d3ee82d60f3f360fb4cfd8ccbf9cd6f1426 Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Mon, 11 Mar 2024 14:00:50 -0400 Subject: [PATCH] tokei: update to v13.0.0-alpha.1 --- ...c4487ef2a8f53c29124b0aa3e9e793bfaadc.patch | 25 ------------------- srcpkgs/tokei/template | 9 ++++--- 2 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch diff --git a/srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch b/srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch deleted file mode 100644 index 46415c14aebaec..00000000000000 --- a/srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream: yes - -From 067fc4487ef2a8f53c29124b0aa3e9e793bfaadc Mon Sep 17 00:00:00 2001 -From: Max Sharnoff -Date: Mon, 4 Apr 2022 12:06:32 +0100 -Subject: [PATCH] Summarise language before adding to total (#903) - ---- - src/language/languages.rs | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/language/languages.rs b/src/language/languages.rs -index 141cae28..2b0fc584 100644 ---- a/src/language/languages.rs -+++ b/src/language/languages.rs -@@ -102,7 +102,8 @@ impl Languages { - #[must_use] - pub fn total(self: &Languages) -> Language { - let mut total = Language::new(); -- for (ty, language) in self { -+ for (ty, l) in self { -+ let language = l.summarise(); - total.comments += language.comments; - total.blanks += language.blanks; - total.code += language.code; diff --git a/srcpkgs/tokei/template b/srcpkgs/tokei/template index ef99d76777e745..6d616ff54e0f9e 100644 --- a/srcpkgs/tokei/template +++ b/srcpkgs/tokei/template @@ -1,15 +1,16 @@ # Template file for 'tokei' pkgname=tokei -version=12.1.2 -revision=4 +_rev=alpha.1 +version=13.0.0 +revision=1 build_style=cargo configure_args="--features all" short_desc="Count lines of code" maintainer="Jan Christian Grünhage " license="Apache-2.0, MIT" homepage="https://github.com/XAMPPRocky/tokei" -distfiles="https://github.com/XAMPPRocky/tokei/archive/v$version.tar.gz" -checksum=81ef14ab8eaa70a68249a299f26f26eba22f342fb8e22fca463b08080f436e50 +distfiles="https://github.com/XAMPPRocky/tokei/archive/v${version}-${_rev}.tar.gz" +checksum=637c6e3d905089f74cf8195666304ac98273cee609541c8a2d87ba438ba08c6e # on i686 LLVM has problems with compiling doctests case "$XBPS_TARGET_MACHINE" in