upgpkg: 0.6.0

2 files changed, 8 insertions, 30 deletions

diff --git a/coreutils-uutils-kj_sh604/.SRCINFO b/coreutils-uutils-kj_sh604/.SRCINFO
index 01deca5..a0b9e22 100644
--- a/coreutils-uutils-kj_sh604/.SRCINFO
+++ b/coreutils-uutils-kj_sh604/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = coreutils-uutils-kj_sh604
 	pkgdesc = Cross-platform Rust rewrite of the GNU coreutils installed as system core utilities (WARNING: use at own risk).
-	pkgver = 0.5.0
+	pkgver = 0.6.0
 	pkgrel = 1
 	url = https://github.com/uutils/coreutils
 	arch = x86_64
@@ -18,13 +18,7 @@ pkgbase = coreutils-uutils-kj_sh604
 	conflicts = coreutils
 	conflicts = b3sum
 	conflicts = sha3sum
-	source = uutils-coreutils-0.5.0.tar.gz::https://github.com/uutils/coreutils/archive/0.5.0.tar.gz
-	source = glibc-2.42.patch::https://git.launchpad.net/~juliank/ubuntu/+source/rust-coreutils/plain/debian/patches/glibc-2.42.patch?h=ubuntu/devel&id=a16e77bec0546ee51770a891a24468e8048242e3
-	source = nix-rust0.30.1.tar.gz::https://github.com/nix-rust/nix/archive/refs/tags/v0.30.1.tar.gz
-	source = 8b1b869-symlink-different-filesystem.patch::https://github.com/uutils/coreutils/commit/8b1b86914ae5e4e364e11a164b9d5e9a6e75da64.patch
-	sha256sums = 83535e10c3273c31baa2f553dfa0ceb4148914e9c1a9c5b00d19fbda5b2d4d7d
-	sha256sums = 3516ae0e2a4fe5fc4996e0f7c9952213f5b7394c739c79f31bafd2ba2a9e2ebb
-	sha256sums = 31742bef74cad04c8bd8c9a7301323e3df35847f5b776024221cbd2060cd5ed7
-	sha256sums = 39e76235cd5cd674962f47bd94d56f7840e9487f887f5ba905dbd3e56d6d5b38
+	source = uutils-coreutils-0.6.0.tar.gz::https://github.com/uutils/coreutils/archive/0.6.0.tar.gz
+	sha256sums = f751b8209ec05ae304941a727e42a668dcc45674986252f44d195ed43ccfad2f
 
 pkgname = coreutils-uutils-kj_sh604
diff --git a/coreutils-uutils-kj_sh604/PKGBUILD b/coreutils-uutils-kj_sh604/PKGBUILD
index 5a6d6da..bc85a81 100644
--- a/coreutils-uutils-kj_sh604/PKGBUILD
+++ b/coreutils-uutils-kj_sh604/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: kj_sh604 <406hs_jk@proton.me>
 
 pkgname=coreutils-uutils-kj_sh604
-pkgver=0.5.0
+pkgver=0.6.0
 pkgrel=1
 pkgdesc='Cross-platform Rust rewrite of the GNU coreutils installed as system
 core utilities (WARNING: use at own risk).'
@@ -31,27 +31,11 @@ makedepends=(
 )
 source=(
   "uutils-coreutils-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
-  "glibc-2.42.patch::https://git.launchpad.net/~juliank/ubuntu/+source/rust-coreutils/plain/debian/patches/glibc-2.42.patch?h=ubuntu/devel&id=a16e77bec0546ee51770a891a24468e8048242e3"
-  nix-rust0.30.1.tar.gz::https://github.com/nix-rust/nix/archive/refs/tags/v0.30.1.tar.gz
-  "8b1b869-symlink-different-filesystem.patch::https://github.com/uutils/coreutils/commit/8b1b86914ae5e4e364e11a164b9d5e9a6e75da64.patch"
 )
-sha256sums=('83535e10c3273c31baa2f553dfa0ceb4148914e9c1a9c5b00d19fbda5b2d4d7d'
-            '3516ae0e2a4fe5fc4996e0f7c9952213f5b7394c739c79f31bafd2ba2a9e2ebb'
-            '31742bef74cad04c8bd8c9a7301323e3df35847f5b776024221cbd2060cd5ed7'
-            '39e76235cd5cd674962f47bd94d56f7840e9487f887f5ba905dbd3e56d6d5b38')
+sha256sums=('f751b8209ec05ae304941a727e42a668dcc45674986252f44d195ed43ccfad2f')
 
-prepare() {
-  cd ${pkgname%-uutils-kj_sh604}-${pkgver}
-  # https://github.com/uutils/coreutils/issues/8586
-  patch -Np1 -i $srcdir/8b1b869-symlink-different-filesystem.patch
-  # https://github.com/uutils/coreutils/issues/8474
-  mkdir -p rust-vendor
-  mv $srcdir/nix-0.30.1 rust-vendor/nix
-  patch -Np1 -i $srcdir/glibc-2.42.patch
-  echo -e "[patch.crates-io]\nnix = { path = \"rust-vendor/nix\" }" >>Cargo.toml
-  export RUSTONIG_DYNAMIC_LIBONIG=1
-
-}
+# this line inside prepare does not work without clean build
+export RUSTONIG_DYNAMIC_LIBONIG=1
 
 package() {
   cd ${pkgname%-uutils-kj_sh604}-${pkgver}
@@ -92,4 +76,4 @@ echo \"warning: runcon is no longer built with the coreutils-uutils-kj_sh604 pac
 exit 1") $pkgdir/usr/bin/runcon
 }
 
-# vim: ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:
\ No newline at end of file