From 3f3022ffbcfd9457587d923a32cc57ad3d2b755b Mon Sep 17 00:00:00 2001
From: "Edinaldo P. Silva" <edps.mundognu@gmail.com>
Date: Fri, 18 May 2018 01:12:47 +0100
Subject: graphics/viewnior: Updated for version 1.7.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 graphics/viewnior/slack-desc          |  4 ++--
 graphics/viewnior/viewnior.SlackBuild | 26 +++++++++++---------------
 graphics/viewnior/viewnior.info       |  8 ++++----
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/graphics/viewnior/slack-desc b/graphics/viewnior/slack-desc
index c858cdf03206f..c8ee53cc00084 100644
--- a/graphics/viewnior/slack-desc
+++ b/graphics/viewnior/slack-desc
@@ -14,6 +14,6 @@ viewnior: screen space for your images. Viewnior is inspired by big projects
 viewnior: like Eye of Gnome, because of its usability and richness, and by
 viewnior: GPicView, because of its lightweight design and minimal interface.
 viewnior:
-viewnior: Viewnior is written in C (GTK+) and uses modified version of the
-viewnior: GtkImageView library by Bjourn Lindqvist.
+viewnior: Home page: https://github.com/hellosiyan/Viewnior
+viewnior:
 viewnior:
diff --git a/graphics/viewnior/viewnior.SlackBuild b/graphics/viewnior/viewnior.SlackBuild
index bd42d93fda810..0fea2c89917d5 100644
--- a/graphics/viewnior/viewnior.SlackBuild
+++ b/graphics/viewnior/viewnior.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for viewnior.
 #
 # Written by Šime Ramov <s@ramov.com>
-# Copyright 2016-2017  Edinaldo P. Silva, Rio de Janeiro, Brazil.
+# Copyright 2016-2018  Edinaldo P. Silva, Rio de Janeiro, Brazil.
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=viewnior
-VERSION=${VERSION:-1.6}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.7}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -60,9 +60,10 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf Viewnior-$PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
 tar xzvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xzvf $CWD/Viewnior-$PRGNAM-$VERSION.tar.gz
-cd Viewnior-$PRGNAM-$VERSION
+mv Viewnior-$PRGNAM-$VERSION $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -70,21 +71,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-autoreconf -fiv
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+meson \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
-  --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+  build
 
-make
-make install DESTDIR=$PKG
+ninja -C build
+DESTDIR=$PKG ninja -C build install
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -93,8 +90,7 @@ 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp AUTHORS COPYING ChangeLog-20090517 INSTALL NEWS README TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp AUTHORS COPYING NEWS README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/graphics/viewnior/viewnior.info b/graphics/viewnior/viewnior.info
index 1e2f64f9daf66..986a6fa57784c 100644
--- a/graphics/viewnior/viewnior.info
+++ b/graphics/viewnior/viewnior.info
@@ -1,10 +1,10 @@
 PRGNAM="viewnior"
-VERSION="1.6"
+VERSION="1.7"
 HOMEPAGE="https://github.com/hellosiyan/Viewnior"
-DOWNLOAD="https://github.com/hellosiyan/Viewnior/archive/viewnior-1.6.tar.gz"
-MD5SUM="f7d497360c48ce4bce09328d934cc4a4"
+DOWNLOAD="https://github.com/hellosiyan/Viewnior/archive/viewnior-1.7.tar.gz"
+MD5SUM="b09587081077b50f9cc51bb4b0223ffe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="meson"
 MAINTAINER="Edinaldo P. Silva"
 EMAIL="edps.mundognu@gmail.com"
-- 
cgit v1.2.3