[PR PATCH] tokei: add unreleased patch for bug

[PR PATCH] tokei: add unreleased patch for bug

[CameronNemo]

[-- Attachment #1: Type: text/plain, Size: 1286 bytes --]

There is a new pull request by CameronNemo against master on the void-packages repository

https://github.com/CameronNemo/void-packages tokei
https://github.com/void-linux/void-packages/pull/37954

tokei: add unreleased patch for bug
https://github.com/XAMPPRocky/tokei/issues/875

@jcgruenhage

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37954.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tokei-37954.patch --]
[-- Type: text/x-diff, Size: 2512 bytes --]

From 5d4f01e38d7966a0b013aeabe21028e9cbe564c8 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 9 Jul 2022 14:37:31 -0700
Subject: [PATCH] tokei: add unreleased patch for bug

https://github.com/XAMPPRocky/tokei/issues/875
---
 ...c4487ef2a8f53c29124b0aa3e9e793bfaadc.patch | 25 +++++++++++++++++++
 srcpkgs/tokei/template                        |  4 +--
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch

diff --git a/srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch b/srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch
new file mode 100644
index 000000000000..46415c14aeba
--- /dev/null
+++ b/srcpkgs/tokei/patches/067fc4487ef2a8f53c29124b0aa3e9e793bfaadc.patch
@@ -0,0 +1,25 @@
+Upstream: yes
+
+From 067fc4487ef2a8f53c29124b0aa3e9e793bfaadc Mon Sep 17 00:00:00 2001
+From: Max Sharnoff <github@max.sharnoff.org>
+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 8e5da7ab3923..ef99d76777e7 100644
--- a/srcpkgs/tokei/template
+++ b/srcpkgs/tokei/template
@@ -1,14 +1,14 @@
 # Template file for 'tokei'
 pkgname=tokei
 version=12.1.2
-revision=2
+revision=4
 build_style=cargo
 configure_args="--features all"
 short_desc="Count lines of code"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/XAMPPRocky/tokei"
-distfiles="https://github.com/XAMPPRocky/tokei/archive/v${version}.tar.gz"
+distfiles="https://github.com/XAMPPRocky/tokei/archive/v$version.tar.gz"
 checksum=81ef14ab8eaa70a68249a299f26f26eba22f342fb8e22fca463b08080f436e50
 
 # on i686 LLVM has problems with compiling doctests

Re: [PR REVIEW] tokei: add unreleased patch for bug

[meator]

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New review comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/37954#discussion_r917349317

Comment:
Why are you increasing the revision by two instead of by one?

Re: [PR PATCH] [Closed]: tokei: add unreleased patch for bug

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1129 bytes --]

There's a closed pull request on the void-packages repository

tokei: add unreleased patch for bug
https://github.com/void-linux/void-packages/pull/37954

Description:
https://github.com/XAMPPRocky/tokei/issues/875

@jcgruenhage

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->