From b824d90ba5ccbb6f6dbd74bad4ae7f035e7f53bb Mon Sep 17 00:00:00 2001
From: Maksim Bondarenkov <119937608+ognevny@users.noreply.github.com>
Date: Wed, 7 Aug 2024 21:56:36 +0300
Subject: [PATCH] jj: update to 0.20.0

---
 mingw-w64-jj/PKGBUILD                         | 28 +++++++++----------
 mingw-w64-jj/jj-remove-unneded-features.patch | 20 ++++---------
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/mingw-w64-jj/PKGBUILD b/mingw-w64-jj/PKGBUILD
index 63fb7f08fc..234c9fe95a 100644
--- a/mingw-w64-jj/PKGBUILD
+++ b/mingw-w64-jj/PKGBUILD
@@ -4,7 +4,7 @@ _realname=jj
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-${_realname}-docs")
-pkgver=0.19.0
+pkgver=0.20.0
 pkgrel=1
 pkgdesc="Jujutsu (an experimental VCS) (mingw-w64)"
 arch=('any')
@@ -24,13 +24,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-libgit2"
          "${MINGW_PACKAGE_PREFIX}-libssh2"
          "${MINGW_PACKAGE_PREFIX}-zstd")
 source=("git+${url}.git#tag=v${pkgver}"
-        "zstd-sys.tar.gz::https://crates.io/api/v1/crates/zstd-sys/2.0.9+zstd.1.5.5/download"
+        "zstd-sys.tar.gz::https://crates.io/api/v1/crates/zstd-sys/2.0.12+zstd.1.5.6/download"
         "zstd-sys-remove-statik.patch"
         "jj-remove-unneded-features.patch")
-sha256sums=('0bbb8b55d69719dc194827ec985f933afd3e702c4b5fa24d76b3caae635b6f7c'
-            '9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656'
+sha256sums=('e5bab4e3aea22e7ceda59368327ef7b3c9db27a234bfe86a43aa1dc02141533d'
+            '0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13'
             '8917b1fbb95021d46f61f2067bcd723657fda781f0a063739f168cd9fb68e555'
-            '241263d0121d24531d6246637b9d422bd50b419da75ecf58412070f4a05edb26')
+            '785cb38d2813adb4868868ae17ba257859026170e4a621e2761fab901d5eb982')
 
 _env() {
   export OPENSSL_NO_VENDOR=1
@@ -41,15 +41,15 @@ _env() {
 }
 
 prepare() {
-  cd "${srcdir}/${_realname}"
+  cd "${_realname}"
 
   patch -Np1 -i "${srcdir}/jj-remove-unneded-features.patch"
 
-  patch -d "../zstd-sys-2.0.9+zstd.1.5.5" -i "${srcdir}/zstd-sys-remove-statik.patch"
+  patch -d "../zstd-sys-2.0.12+zstd.1.5.6" -i "${srcdir}/zstd-sys-remove-statik.patch"
   cat >> Cargo.toml <<END
 
 [patch.crates-io]
-zstd-sys = { path = "../zstd-sys-2.0.9+zstd.1.5.5" }
+zstd-sys = { path = "../zstd-sys-2.0.12+zstd.1.5.6" }
 END
 
   cargo update -p zstd-sys
@@ -57,7 +57,7 @@ END
 }
 
 build() {
-  cd "${srcdir}/${_realname}"
+  cd "${_realname}"
 
   _env
   cargo build \
@@ -68,7 +68,7 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${_realname}"
+  cd "${_realname}"
 
   _env
   cargo test \
@@ -79,7 +79,7 @@ check() {
 }
 
 package_jj() {
-  cd "${srcdir}/${_realname}"
+  cd "${_realname}"
 
   _env
   cargo install \
@@ -102,10 +102,8 @@ package_jj-docs() {
   pkgdesc+=" (documentation)"
   depends=()
 
-  cd "${srcdir}/${_realname}"
-
-  install -Dm644 README.md "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md"
-  cp -r docs "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"
+  install -Dm644 "${_realname}"/README.md "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md"
+  cp -r "${_realname}"/docs "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"
 }
 
 # template start; name=mingw-w64-splitpkg-wrappers; version=1.0;
diff --git a/mingw-w64-jj/jj-remove-unneded-features.patch b/mingw-w64-jj/jj-remove-unneded-features.patch
index 78983f402a..ded0507ca3 100644
--- a/mingw-w64-jj/jj-remove-unneded-features.patch
+++ b/mingw-w64-jj/jj-remove-unneded-features.patch
@@ -1,28 +1,20 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index 7135bf1a..21f93e79 100644
+index 6df57da61..466996a69 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -1706,7 +1706,6 @@ dependencies = [
+@@ -1879,7 +1879,6 @@ dependencies = [
   "indoc",
   "insta",
-  "itertools 0.12.1",
+  "itertools 0.13.0",
 - "jj-cli",
   "jj-lib",
   "libc",
   "maplit",
 diff --git a/cli/Cargo.toml b/cli/Cargo.toml
-index fd1085b8..d16a5acf 100644
+index a1d0523b9..28d041337 100644
 --- a/cli/Cargo.toml
 +++ b/cli/Cargo.toml
-@@ -22,28 +22,13 @@ include = [
-     "/tests/",
-     "!*.pending-snap",
-     "!*.snap*",
--    "/tests/cli-reference@.md.snap"
-+    "/tests/cli-reference@.md.snap",
- ]
- 
- [[bin]]
+@@ -29,21 +29,6 @@ include = [
  name = "jj"
  path = "src/main.rs"
  
@@ -44,7 +36,7 @@ index fd1085b8..d16a5acf 100644
  [[test]]
  name = "runner"
  
-@@ -105,14 +90,11 @@ insta = { workspace = true }
+@@ -107,14 +92,11 @@ insta = { workspace = true }
  test-case = { workspace = true }
  testutils = { workspace = true }
  # https://github.com/rust-lang/cargo/issues/2911#issuecomment-1483256987