graphics/feh: Updated for version 3.10.3, new maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

4 files changed, 40 insertions, 56 deletions

diff --git a/graphics/feh/README b/graphics/feh/README
index 640ffaed62..f83585cc74 100644
--- a/graphics/feh/README
+++ b/graphics/feh/README
@@ -1,22 +1,8 @@
+feh (image viewer)
+
 feh is an image viewer at heart, though it does other cool stuff.
 feh features include simple image viewing, multiple image viewing
 (slideshow), multiple image viewing in multiwindows, image viewing
 in fullscreen, image list mode, loadable/unloadable listing,
 recursive file opening, saving/loading filelists, loading images
 via http, reloading after delay, montage creation, and more.
-
-To enable builtin EXIF tag display support use:
-
-  EXIF=yes ./feh.SlackBuild
-
-To include help text use:
-
-  HELP=yes ./feh.SlackBuild
-
-To enable enable inotify support use:
-
-  INOTIFY=yes ./feh.SlackBuild
-
-To support CIFS shares from 64bit hosts on 32bit machines use:
-
-  STAT64=yes ./feh.SlackBuild
diff --git a/graphics/feh/feh.SlackBuild b/graphics/feh/feh.SlackBuild
index c6f03f7eb5..8ab06755f7 100644
--- a/graphics/feh/feh.SlackBuild
+++ b/graphics/feh/feh.SlackBuild
@@ -2,10 +2,11 @@
 
 # Slackware build script for feh
 
-# Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com>
-# Copyright 2011-2012 Grigorios Bouzakis <grbzks@imap.cc>
-# Copyright 2014-2015 Luka Novsak <lnovsak@gmail.com>
-# Copyright 2017-2021 Hunter Sezen <orbea@riseup.net>
+# Copyright 2006-2009 Chess Griffin
+# Copyright 2011-2012 Grigorios Bouzakis
+# Copyright 2014-2015 Luka Novsak
+# Copyright 2017-2021 Hunter Sezen
+# Copyright 2024 B. Watson <urchlay@slackware.uk>
 # All rights reserved.
 #
 # Permission to use, copy, modify, and distribute this software for any purpose
@@ -23,10 +24,17 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20240903 bkw:
+# - new maintainer
+# - update for v3.10.3
+# - build with all useful options enabled, instead of having 4
+#   separate environment vars.
+# - add rest of docs to doc dir.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=feh
-VERSION=${VERSION:-3.6.1}
+VERSION=${VERSION:-3.10.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -39,9 +47,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -53,16 +58,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -eu
@@ -75,24 +76,24 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 chmod 0755 $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 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-[ "${EXIF:=0}" = 0 ] || EXIF=1
-[ "${HELP:=0}" = 0 ] || HELP=1
-[ "${INOTIFY:=0}" = 0 ] || INOTIFY=1
-[ "${STAT64:=0}" = 0 ] || STAT64=1
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 CFLAGS="$SLKCFLAGS" \
 make \
   PREFIX=/usr \
-  exif=$EXIF \
-  help=$HELP \
-  inotify=$INOTIFY \
-  stat64=$STAT64
+  curl=1 \
+  debug=1 \
+  exif=1 \
+  help=1 \
+  inotify=1 \
+  stat64=1 \
+  magic=1 \
+  mkstemps=1 \
+  verscmp=0 \
+  xinerama=1
+
+strip src/feh
 
 make install \
   DESTDIR=$PKG \
@@ -101,15 +102,12 @@ make install \
   doc_dir=$PKG/usr/doc/$PRGNAM-$VERSION \
   example_dir=$PKG/usr/doc/$PRGNAM-$VERSION/examples
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" |
-  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-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
+gzip -9 $PKG/usr/man/man*/*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHORS COPYING ChangeLog README.md TODO $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/graphics/feh/feh.info b/graphics/feh/feh.info
index 5be6bc0044..01238d2b75 100644
--- a/graphics/feh/feh.info
+++ b/graphics/feh/feh.info
@@ -1,10 +1,10 @@
 PRGNAM="feh"
-VERSION="3.6.1"
+VERSION="3.10.3"
 HOMEPAGE="https://feh.finalrewind.org"
-DOWNLOAD="https://feh.finalrewind.org/feh-3.6.1.tar.bz2"
-MD5SUM="0dd986d77805cd306a81864c69cf040c"
+DOWNLOAD="https://feh.finalrewind.org/feh-3.10.3.tar.bz2"
+MD5SUM="4f9e2c6ecc120852ba86dc41df366aba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="imlib2"
-MAINTAINER="Hunter Sezen"
-EMAIL="orbea@riseup.net"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/graphics/feh/slack-desc b/graphics/feh/slack-desc
index 92d931a140..069734d1c6 100644
--- a/graphics/feh/slack-desc
+++ b/graphics/feh/slack-desc
@@ -8,6 +8,7 @@
    |-----handy-ruler------------------------------------------------------|
 feh: feh (image viewer)
 feh:
+feh: feh is an image viewer at heart, though it does other cool stuff.
 feh: feh features include simple image viewing, multiple image viewing
 feh: (slideshow), multiple image viewing in multiwindows, image viewing
 feh: in fullscreen, image list mode, loadable/unloadable listing,
@@ -16,4 +17,3 @@ feh: via http, reloading after delay, montage creation, and more.
 feh:
 feh: Homepage: https://feh.finalrewind.org
 feh:
-feh: