system/exa: Updated for version 0.8.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

1 files changed, 56 insertions, 47 deletions

diff --git a/system/exa/exa.SlackBuild b/system/exa/exa.SlackBuild
index 51154ddc62..dc5cda8458 100644
--- a/system/exa/exa.SlackBuild
+++ b/system/exa/exa.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exa
-VERSION=${VERSION:-0.7.0}
+VERSION=${VERSION:-0.8.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,15 +43,19 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
+  CARGOTARGET="--target i586-unknown-linux-gnu"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  CARGOTARGET="--target i686-unknown-linux-gnu"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  CARGOTARGET="--target x86_64-unknown-linux-gnu"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
+  CARGOTARGET=""
 fi
 
 set -e
@@ -63,14 +67,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-# cargo can't use vendored git depenencies so force zoneinfo_compiled git
-# snapshot to act like any other crate dependency.
-# tar.gz of the git commit is manipulated below in the dependecy loop to match
-# the patched Cargo.lock
-# https://github.com/rust-lang/cargo/pull/3992
-# https://github.com/alexcrichton/cargo-vendor/pull/42
-patch -p1 < $CWD/vendor.diff
-
 # build offline
 # configuration tells cargo to use the configured directory
 # for dependencies intead of downloading from crates.io
@@ -89,63 +85,73 @@ mkdir vendor
 (
   cd vendor
 
-  for dependency in ansi_term=0.8.0 \
+  for dependency in aho-corasick=0.5.3 \
+                    ansi_term=0.8.0 \
+                    bitflags=0.7.0 \
                     bitflags=0.9.1 \
                     byteorder=0.4.2 \
-                    cmake=0.1.24 \
-                    datetime=0.4.4 \
-                    gcc=0.3.51 \
+                    cmake=0.1.25 \
+                    conv=0.3.3 \
+                    custom_derive=0.1.7 \
+                    datetime=0.4.5 \
+                    env_logger=0.3.5 \
+                    gcc=0.3.53 \
                     getopts=0.2.14 \
-                    git2=0.6.6 \
+                    git2=0.6.8 \
                     glob=0.2.11 \
-                    idna=0.1.2 \
+                    idna=0.1.4 \
                     iso8601=0.1.1 \
+                    kernel32-sys=0.2.2 \
                     lazy_static=0.2.8 \
-                    libc=0.2.24 \
-                    libgit2-sys=0.6.12 \
+                    libc=0.2.30 \
+                    libgit2-sys=0.6.14 \
                     libz-sys=1.0.16 \
                     locale=0.2.2 \
+                    log=0.3.8 \
+                    magenta=0.1.1 \
+                    magenta-sys=0.1.1 \
                     matches=0.1.6 \
+                    memchr=0.1.11 \
                     natord=1.0.9 \
                     nom=1.2.4 \
-                    num=0.1.39 \
-                    num-bigint=0.1.39 \
-                    num-complex=0.1.38 \
-                    num-integer=0.1.34 \
-                    num-iter=0.1.33 \
-                    num-rational=0.1.38 \
-                    num-traits=0.1.39 \
+                    num=0.1.40 \
+                    num-bigint=0.1.40 \
+                    num-complex=0.1.40 \
+                    num-integer=0.1.35 \
+                    num-iter=0.1.34 \
+                    num-rational=0.1.39 \
+                    num-traits=0.1.40 \
                     num_cpus=1.6.2 \
                     number_prefix=0.2.7 \
                     pad=0.1.4 \
                     percent-encoding=1.0.0 \
                     pkg-config=0.3.9 \
-                    rand=0.3.15 \
+                    rand=0.3.16 \
+                    redox_syscall=0.1.31 \
+                    regex=0.1.80 \
+                    regex-syntax=0.3.9 \
                     rustc-serialize=0.3.24 \
                     scoped_threadpool=0.1.7 \
-                    term_grid=0.1.5 \
-                    unicode-bidi=0.3.3 \
+                    term_grid=0.1.6 \
+                    term_size=0.3.0 \
+                    thread-id=2.0.0 \
+                    thread_local=0.2.7 \
+                    unicode-bidi=0.3.4 \
                     unicode-normalization=0.1.5 \
                     unicode-width=0.1.4 \
                     url=1.5.1 \
-                    users=0.5.2 \
+                    users=0.5.3 \
+                    utf8-ranges=0.1.3 \
                     vcpkg=0.2.2 \
-                    zoneinfo_compiled=0.2.1 ; do
+                    winapi=0.2.8 \
+                    winapi-build=0.1.1 \
+                    zoneinfo_compiled=0.4.5; do
     dep="$(echo "$dependency" | cut -d= -f1)"
     ver="$(echo "$dependency" | cut -d= -f2)"
 
-    if [ "$dep" = "zoneinfo_compiled" ] ; then
-      zoneinfo_srcnam="$(echo "$dep" | tr _ -)"
-      zoneinfo_sha1="f56921ea5e9f7cf065b1480ff270a1757c1f742f"
-      crate="$CWD/$zoneinfo_srcnam-$zoneinfo_sha1.tar.gz"
-      tar xvf "$crate"
-      mv "$zoneinfo_srcnam-$zoneinfo_sha1" "$dep-$ver"
-    else
-      crate="$CWD/$dep-$ver.crate"
-      tar xvf "$crate"
-    fi
+    tar xvf $CWD/$dep-$ver.crate
 
-    touch "$dep-$ver/.cargo-ok"
+    touch $dep-$ver/.cargo-ok
 
     # generate checksum
     {
@@ -153,17 +159,17 @@ mkdir vendor
       printf '    "files": {\n'
 
       (
-        cd "$dep-$ver"
+        cd $dep-$ver
         find . -type f -print0 | xargs -0 sha256sum | sed -n '/\.cargo-checksum\.json/!p' | sed 's/\.\///;s/^\([^ ]*\)[[:space:]][[:space:]]*\(.*\)$/"\2":"\1",/'
       ) | sed '$ s/,$//'
 
       printf "    },\n"
       printf '    "package": "'
 
-      sha256sum "$crate" | cut -f1 -d' ' | sed 's/$/"/'
+      sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/'
 
       printf "}\n"
-    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > "$dep-$ver/.cargo-checksum.json"
+    } | python -c "import sys, json; data = sys.stdin.read(); print json.dumps(json.loads(data), sort_keys=True, indent=4, separators=(',', ' : '))" > $dep-$ver/.cargo-checksum.json
   done
 )
 
@@ -173,15 +179,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-cargo build --release
-
 mkdir -p $PKG/usr/share/bash-completion/completions/
 mkdir -p $PKG/usr/share/zsh/vendor-completions/
 mkdir -p $PKG/usr/bin
 
-make install install-bash-completions install-zsh-completions DESTDIR=$PKG PREFIX=/usr
+sed -i 's,share/man,man,' Makefile
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+cargo build --release --no-default-features --features default
 
-mv $PKG/usr/share/man $PKG/usr
+find target -name exa -exec install -m 755 {} $PKG/usr/bin/exa \;
+make install-man install-bash-completions install-zsh-completions DESTDIR=$PKG PREFIX=/usr BASHDIR=/usr/share/bash-completion/completions
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done