Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] diffr: update to 0.1.5.
@ 2023-04-13 10:27 atweiden
  2023-04-13 11:55 ` [PR PATCH] [Updated] " atweiden
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: atweiden @ 2023-04-13 10:27 UTC (permalink / raw)
  To: ml

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

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

https://github.com/atweiden/void-packages diffr
https://github.com/void-linux/void-packages/pull/43422

diffr: update to 0.1.5.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl

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

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

From abdc3935e94acd10475e583ce59839f3b5725221 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 13 Apr 2023 09:51:23 +0000
Subject: [PATCH] diffr: update to 0.1.5.

---
 ...51190affd4ce676bb184cd8cc52e20947bfc.patch | 78 -------------------
 srcpkgs/diffr/template                        |  4 +-
 2 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch

diff --git a/srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch b/srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch
deleted file mode 100644
index 60b9b2f86df9..000000000000
--- a/srcpkgs/diffr/patches/eca551190affd4ce676bb184cd8cc52e20947bfc.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From eca551190affd4ce676bb184cd8cc52e20947bfc Mon Sep 17 00:00:00 2001
-From: Nathan Moreau <nathan.moreau@m4x.org>
-Date: Thu, 19 Mar 2020 23:47:50 +0100
-Subject: [PATCH] Fix build on 32 bits plateforms.
-
----
- src/main.rs | 8 ++++----
- src/test.rs | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/main.rs b/src/main.rs
-index bccc6c4..333438f 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -574,7 +574,7 @@ struct HunkHeader {
-     plus_range: (usize, usize),
- }
- 
--const WIDTH: [usize; 20] = [
-+const WIDTH: [u64; 20] = [
-     0,
-     9,
-     99,
-@@ -597,7 +597,7 @@ const WIDTH: [usize; 20] = [
-     9999999999999999999,
- ];
- 
--fn width1(x: usize) -> usize {
-+fn width1(x: u64) -> usize {
-     let result = WIDTH.binary_search(&x);
-     match result {
-         Ok(i) | Err(i) => i,
-@@ -613,8 +613,8 @@ impl HunkHeader {
-     }
- 
-     fn width(&self) -> usize {
--        2 * width1(self.minus_range.0 + self.minus_range.1)
--            .max(width1(self.plus_range.0 + self.plus_range.1))
-+        2 * width1((self.minus_range.0 + self.minus_range.1) as u64)
-+            .max(width1((self.plus_range.0 + self.plus_range.1) as u64))
-             + 1
-     }
- }
-diff --git a/src/test.rs b/src/test.rs
-index d1254d3..5de7ba4 100644
---- a/src/test.rs
-+++ b/src/test.rs
-@@ -63,12 +63,12 @@ fn parse_line_number_test() {
- #[test]
- fn test_width() {
-     for (i, x) in WIDTH.iter().enumerate() {
--        if x < &usize::max_value() {
-+        if x < &u64::max_value() {
-             assert_eq!(format!("{}", x + 1).len(), i + 1);
-         }
-     }
-     assert_eq!(0, width1(0));
--    fn test(x: usize) {
-+    fn test(x: u64) {
-         assert_eq!(format!("{}", x).len(), width1(x));
-     }
-     for i in 1..=10000 {
-@@ -80,7 +80,7 @@ fn test_width() {
-     for i in 0..64 {
-         test(1 << i);
-     }
--    test(usize::max_value());
-+    test(u64::max_value());
- 
-     assert_eq!("123:456".len(), HunkHeader::new((123, 5), (456, 9)).width());
-     assert_eq!(
-@@ -88,5 +88,5 @@ fn test_width() {
-         HunkHeader::new((123, 999), (456, 9)).width()
-     );
-     assert_eq!("   :456".len(), HunkHeader::new((0, 0), (456, 9)).width());
--    assert_eq!(MAX_MARGIN, 2 * width1(usize::max_value()) + 1);
-+    assert_eq!(MAX_MARGIN, 2 * width1(u64::max_value()) + 1);
- }
diff --git a/srcpkgs/diffr/template b/srcpkgs/diffr/template
index f1e8f096375b..c06b4b1fc5e7 100644
--- a/srcpkgs/diffr/template
+++ b/srcpkgs/diffr/template
@@ -1,6 +1,6 @@
 # Template file for 'diffr'
 pkgname=diffr
-version=0.1.4
+version=0.1.5
 revision=1
 build_style=cargo
 short_desc="LCS based diff highlighting tool to ease code review from your terminal"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/mookid/diffr"
 changelog="https://github.com/mookid/diffr/raw/master/CHANGELOG.md"
 distfiles="https://github.com/mookid/diffr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2613b57778df4466a20349ef10b9e022d0017b4aee9a47fb07e78779f444f8cb
+checksum=6c5861e5b8f5d798e027fe69cc186452848dc4ae5641326b41b5c160d3e91654
 
 do_install() {
 	vbin "target/${RUST_TARGET}/release/diffr"

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-06-15 11:02 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-13 10:27 [PR PATCH] diffr: update to 0.1.5 atweiden
2023-04-13 11:55 ` [PR PATCH] [Updated] " atweiden
2023-04-13 12:11 ` atweiden
2023-04-13 12:41 ` atweiden
2023-06-14 17:54 ` Duncaen
2023-06-15  0:35 ` [PR PATCH] [Updated] " atweiden
2023-06-15  0:41 ` atweiden
2023-06-15 11:02 ` [PR PATCH] [Merged]: " Duncaen

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).