CVS commit: pkgsrc/textproc/git-delta

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Fri Oct 20 21:21:28 UTC 2023

Modified Files:
        pkgsrc/textproc/git-delta: Makefile cargo-depends.mk distinfo
        pkgsrc/textproc/git-delta/patches: patch-Cargo.toml

Log Message:
textproc/git-delta: fix build with new libgit2


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/git-delta/Makefile \
    pkgsrc/textproc/git-delta/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/git-delta/cargo-depends.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/git-delta/patches/patch-Cargo.toml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/git-delta/Makefile
diff -u pkgsrc/textproc/git-delta/Makefile:1.12 pkgsrc/textproc/git-delta/Makefile:1.13
--- pkgsrc/textproc/git-delta/Makefile:1.12     Sun Jun  4 20:18:34 2023
+++ pkgsrc/textproc/git-delta/Makefile  Fri Oct 20 21:21:28 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2023/06/04 20:18:34 pin Exp $
+# $NetBSD: Makefile,v 1.13 2023/10/20 21:21:28 pin Exp $
 
 DISTNAME=      delta-0.16.5
+PKGREVISION=   1
 PKGNAME=       git-delta-0.16.5
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dandavison/}
Index: pkgsrc/textproc/git-delta/distinfo
diff -u pkgsrc/textproc/git-delta/distinfo:1.12 pkgsrc/textproc/git-delta/distinfo:1.13
--- pkgsrc/textproc/git-delta/distinfo:1.12     Sun Jun  4 20:18:34 2023
+++ pkgsrc/textproc/git-delta/distinfo  Fri Oct 20 21:21:28 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2023/06/04 20:18:34 pin Exp $
+$NetBSD: distinfo,v 1.13 2023/10/20 21:21:28 pin Exp $
 
 BLAKE2s (adler-1.0.2.crate) = f263779d752af886455fc0f42c997893fb1a09edcf1bd2980605251c2e3602aa
 SHA512 (adler-1.0.2.crate) = 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
@@ -45,6 +45,9 @@ Size (bincode-1.3.3.crate) = 28958 bytes
 BLAKE2s (bitflags-1.3.2.crate) = e3a3b45a4403823875a03dbda329ca16068fa8f847cef81987c6b780101f2415
 SHA512 (bitflags-1.3.2.crate) = 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 Size (bitflags-1.3.2.crate) = 23021 bytes
+BLAKE2s (bitflags-2.1.0.crate) = 50f5f72973766df276c34af1de54459950a19992f2593f08b4a0bf8128442f84
+SHA512 (bitflags-2.1.0.crate) = 25912118fc08125a3520d2aeaacc5d35f9876ff4bc23b551da6c9e23ad05fd1d6ecddf188f1343aebd1d3b4d7b24b3081af27e5c98a4ce6bcc8bda73d5370ea3
+Size (bitflags-2.1.0.crate) = 33325 bytes
 BLAKE2s (bitflags-2.2.1.crate) = fd1755befdc1db896c299bc9261bb1a686b0d0496a5627f5f5ce502cad237743
 SHA512 (bitflags-2.2.1.crate) = 413b602edb82f8a4553735e46feefe323137b742d003368e037406157f916e5a5ea002d015a27cf8d41accca75f103c6712e2268fe2853d4d5e93e7264682182
 Size (bitflags-2.2.1.crate) = 35798 bytes
@@ -186,9 +189,9 @@ Size (form_urlencoded-1.1.0.crate) = 873
 BLAKE2s (getrandom-0.2.8.crate) = 3384f83c641aae81e11d7974210ee38cc05eb376d6cbf156b219236ab21f9159
 SHA512 (getrandom-0.2.8.crate) = cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
 Size (getrandom-0.2.8.crate) = 30553 bytes
-BLAKE2s (git2-0.17.2.crate) = d614dcd1a7eff45c4e3d38bef739346f89e3453d62d8a0b237b49725c0bab9dd
-SHA512 (git2-0.17.2.crate) = ca04bc97d0d6e862376ebe62fde456b03eb9f606b06c1703e1afa98791ae4e702694b7ec8cd06bd059500daca9acf216d9f3dd3c3638018d4cb9388b144265ab
-Size (git2-0.17.2.crate) = 208040 bytes
+BLAKE2s (git2-0.18.1.crate) = bb2b0ce5e716c9eee1efd597f2e35c2f01beb7970329abee31d8ec3f76b02f2a
+SHA512 (git2-0.18.1.crate) = 3fb535e820365ac5aecc5a1cd3af869ea952ed6741a7890b095ac6f4509fdee7389949da45e4f66188b5e261fb4c47d49ffc1043b4b2b39020ea21e22bc69fa7
+Size (git2-0.18.1.crate) = 211466 bytes
 BLAKE2s (globset-0.4.10.crate) = d8000af6f73464d16e587c06837aa05f3e0cef307129df7ceef9495c2e0005c1
 SHA512 (globset-0.4.10.crate) = 85a1213fd3ec55ffd87fde25f4cdbd2e8ed4056132d3c516eb117f107a744d733e1ad8fa06f296a60084a23ee968c3c0899399fd3ab9bbf72e217638a5cf165e
 Size (globset-0.4.10.crate) = 22923 bytes
@@ -243,9 +246,9 @@ Size (lazy_static-1.4.0.crate) = 10443 b
 BLAKE2s (libc-0.2.139.crate) = 853f2cdf8ed8de1e87cebc90a4aaa0b85007ee732a1c4bc499a40d7bc975afc5
 SHA512 (libc-0.2.139.crate) = ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
 Size (libc-0.2.139.crate) = 638983 bytes
-BLAKE2s (libgit2-sys-0.15.2+1.6.4.crate) = 5e142c6bb9a4f89ba24c4fb2b1fb842486381ef0c4484c9d33f207c1321508fa
-SHA512 (libgit2-sys-0.15.2+1.6.4.crate) = 28b66ffe6da956bd1127aef295b222b55681b25c1820e016284802531f5360e6d21c11c695be569d26a318321868a0ce0b2c848bfcc887f09f47fbaadb13b478
-Size (libgit2-sys-0.15.2+1.6.4.crate) = 1755413 bytes
+BLAKE2s (libgit2-sys-0.16.1+1.7.1.crate) = 90c017de253c926126f6f8014f41e7a97957ecb1322dae29dd6256eb6584ff0a
+SHA512 (libgit2-sys-0.16.1+1.7.1.crate) = 746e80309af40af7f6d11a7d45721054a6b7f456e10af5b25ea5ddc3ae1f8d934196e9e3b9948f7d7b41b6d9dc45a660874029a39c1c3d67307daebae3f2cb69
+Size (libgit2-sys-0.16.1+1.7.1.crate) = 1773446 bytes
 BLAKE2s (libz-sys-1.1.8.crate) = 1499b7b9bd7305e9357266fef91b4af4b2b63ddfb9981e3adbbd42969756621e
 SHA512 (libz-sys-1.1.8.crate) = 0766ab72cc1414160ccefe4812e6204cbed1341607e5d17607f24fd4ff81dca68d8f2cf43e1d27f332a508d602bff0ad340c4c647a5d5f85acc120c19cfb4100
 Size (libz-sys-1.1.8.crate) = 2481844 bytes
@@ -591,4 +594,4 @@ Size (xdg-2.4.1.crate) = 14034 bytes
 BLAKE2s (yaml-rust-0.4.5.crate) = 65c7c0fe708cb682959e36fbb03b09a35b09d529e5c87364107f5985940a1404
 SHA512 (yaml-rust-0.4.5.crate) = 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 Size (yaml-rust-0.4.5.crate) = 47783 bytes
-SHA1 (patch-Cargo.toml) = 6f8a970e21422c146f4617dd1e6f16a2899b0b22
+SHA1 (patch-Cargo.toml) = f3ba9beeb19dc637b07c266b755f0231f8f2c256

Index: pkgsrc/textproc/git-delta/cargo-depends.mk
diff -u pkgsrc/textproc/git-delta/cargo-depends.mk:1.8 pkgsrc/textproc/git-delta/cargo-depends.mk:1.9
--- pkgsrc/textproc/git-delta/cargo-depends.mk:1.8      Sun Jun  4 20:18:34 2023
+++ pkgsrc/textproc/git-delta/cargo-depends.mk  Fri Oct 20 21:21:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: cargo-depends.mk,v 1.8 2023/06/04 20:18:34 pin Exp $
+# $NetBSD: cargo-depends.mk,v 1.9 2023/10/20 21:21:28 pin Exp $
 
 CARGO_CRATE_DEPENDS+=  adler-1.0.2
 CARGO_CRATE_DEPENDS+=  aho-corasick-0.7.20
@@ -15,6 +15,7 @@ CARGO_CRATE_DEPENDS+= base64-0.21.0
 CARGO_CRATE_DEPENDS+=  bat-0.22.1
 CARGO_CRATE_DEPENDS+=  bincode-1.3.3
 CARGO_CRATE_DEPENDS+=  bitflags-1.3.2
+CARGO_CRATE_DEPENDS+=  bitflags-2.1.0
 CARGO_CRATE_DEPENDS+=  bitflags-2.2.1
 CARGO_CRATE_DEPENDS+=  box_drawing-0.1.2
 CARGO_CRATE_DEPENDS+=  bstr-1.3.0
@@ -61,7 +62,7 @@ CARGO_CRATE_DEPENDS+= flate2-1.0.25
 CARGO_CRATE_DEPENDS+=  fnv-1.0.7
 CARGO_CRATE_DEPENDS+=  form_urlencoded-1.1.0
 CARGO_CRATE_DEPENDS+=  getrandom-0.2.8
-CARGO_CRATE_DEPENDS+=  git2-0.17.2
+CARGO_CRATE_DEPENDS+=  git2-0.18.1
 CARGO_CRATE_DEPENDS+=  globset-0.4.10
 CARGO_CRATE_DEPENDS+=  grep-cli-0.1.7
 CARGO_CRATE_DEPENDS+=  hashbrown-0.12.3
@@ -80,7 +81,7 @@ CARGO_CRATE_DEPENDS+= jobserver-0.1.26
 CARGO_CRATE_DEPENDS+=  js-sys-0.3.61
 CARGO_CRATE_DEPENDS+=  lazy_static-1.4.0
 CARGO_CRATE_DEPENDS+=  libc-0.2.139
-CARGO_CRATE_DEPENDS+=  libgit2-sys-0.15.2+1.6.4
+CARGO_CRATE_DEPENDS+=  libgit2-sys-0.16.1+1.7.1
 CARGO_CRATE_DEPENDS+=  libz-sys-1.1.8
 CARGO_CRATE_DEPENDS+=  line-wrap-0.1.1
 CARGO_CRATE_DEPENDS+=  link-cplusplus-1.0.8

Index: pkgsrc/textproc/git-delta/patches/patch-Cargo.toml
diff -u pkgsrc/textproc/git-delta/patches/patch-Cargo.toml:1.1 pkgsrc/textproc/git-delta/patches/patch-Cargo.toml:1.2
--- pkgsrc/textproc/git-delta/patches/patch-Cargo.toml:1.1      Sun Jun  4 20:18:34 2023
+++ pkgsrc/textproc/git-delta/patches/patch-Cargo.toml  Fri Oct 20 21:21:28 2023
@@ -1,6 +1,6 @@
-$NetBSD: patch-Cargo.toml,v 1.1 2023/06/04 20:18:34 pin Exp $
+$NetBSD: patch-Cargo.toml,v 1.2 2023/10/20 21:21:28 pin Exp $
 
-Fix for libgit2
+Fix for libgit2.
 
 --- Cargo.toml.orig    2023-06-03 14:04:09.000000000 +0000
 +++ Cargo.toml
@@ -9,7 +9,7 @@ Fix for libgit2
  
  [dependencies.git2]
 -version = "0.16.1"
-+version = "0.17.2"
++version = "0.18.1"
  default-features = false
  features = []