system/vtcol: Compile with latest rust in patches.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

6 files changed, 16 insertions, 36 deletions

diff --git a/system/vtcol/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz b/system/vtcol/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz
new file mode 100644
index 000000000000..45129dff9eb7
--- /dev/null
+++ b/system/vtcol/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz
diff --git a/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch b/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch
deleted file mode 100644
index ef76ea2ef7ff..000000000000
--- a/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 9dda18921a25f64e0a0da06e3417ce99f8bf9b41 Mon Sep 17 00:00:00 2001
-From: Andrew Clemons <andrew.clemons@gmail.com>
-Date: Wed, 25 Oct 2017 21:35:14 +1300
-Subject: [PATCH] Silence warning for missing path for `vtcol` binary
-
-vtcol.rs should probably be main.rs, but explicitly setting the
-non-standard path also silences the warning. (src/bin would also work)
----
- Cargo.lock | 2 +-
- Cargo.toml | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 16590af..0833d44 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -14,6 +14,7 @@ license     = "GPL-3.0"
- 
- [[bin]]
- name        = "vtcol"
-+path        = "src/vtcol.rs"
- test        = false
- doc         = false
- 
diff --git a/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz b/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz
new file mode 100644
index 000000000000..e6f330efc006
--- /dev/null
+++ b/system/vtcol/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz
diff --git a/system/vtcol/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz b/system/vtcol/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz
new file mode 100644
index 000000000000..2716a62ed85c
--- /dev/null
+++ b/system/vtcol/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz
diff --git a/system/vtcol/vtcol.SlackBuild b/system/vtcol/vtcol.SlackBuild
index d71e8d72e752..b32862aeefe3 100644
--- a/system/vtcol/vtcol.SlackBuild
+++ b/system/vtcol/vtcol.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for vtcol
 
-# Copyright 2017-2019 Andrew Clemons, Wellington New Zealand
+# Copyright 2017-2020 Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 PRGNAM=vtcol
 VERSION=${VERSION:-0.42.2}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -65,11 +65,13 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-v$VERSION
+tar xvf $CWD/$PRGNAM-v$VERSION.tar.gz
+cd $PRGNAM-v$VERSION
 
-patch -p1 < $CWD/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch
+zcat $CWD/9dda18921a25f64e0a0da06e3417ce99f8bf9b41.patch.gz | patch -p1
+zcat $CWD/0bca17247120d2ec2ae465bac7dd6d0354189175.patch.gz | patch -p1
+zcat $CWD/f00fed1f947dcd372a598f1e2905ae9d4c8a1b0c.patch.gz | patch -p1
 
 # build offline
 # configuration tells cargo to use the configured directory
diff --git a/system/vtcol/vtcol.info b/system/vtcol/vtcol.info
index 9f3fc6567268..e55ba739e64e 100644
--- a/system/vtcol/vtcol.info
+++ b/system/vtcol/vtcol.info
@@ -1,12 +1,14 @@
 PRGNAM="vtcol"
 VERSION="0.42.2"
 HOMEPAGE="https://gitlab.com/phgsng/vtcol"
-DOWNLOAD="https://github.com/phi-gamma/vtcol/archive/v0.42.2/vtcol-0.42.2.tar.gz \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/getopts/getopts-0.2.14.crate \
-          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.19.crate"
-MD5SUM="80091d0507aff4fe8bfb8d82e70a020c \
-        6d59f4fa29cab7bcc7ea7e0c8f96e27d \
-        604a2edfd52c6e87d8903ef2795da387"
+DOWNLOAD="https://gitlab.com/phgsng/vtcol/-/archive/v0.42.2/vtcol-v0.42.2.tar.gz \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/getopts/getopts-0.2.21.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/libc/libc-0.2.19.crate \
+          https://crates-io.s3-us-west-1.amazonaws.com/crates/unicode-width/unicode-width-0.1.8.crate"
+MD5SUM="94ec72b7b2cc7d1a2ed80d2a08a70761 \
+        c3ec5977ecc0f6244ef3be87f5325e72 \
+        604a2edfd52c6e87d8903ef2795da387 \
+        4272c279b06b88f8b0ffce7109348e27"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""