feh: Update to 3.5

* Release v3.5
    * Enable --version-sort on systems without strverscmp support. This
      works by bundling the strverscmp of musl libc with feh and using it
      when feh is compiled without the verscmp flag (i.e., when the system
      libc does not provide the verscmp function). Patch by Tim van der Molen
    * Add %a format specifier (slideshow state: "playing" / "paused")
    * Fix crashes when combining --reload and --multiwindow

5 files changed, 65 insertions, 7 deletions

diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 691b3ec67e5..0da79e93e25 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.108 2020/06/13 18:25:08 nia Exp $
+# $NetBSD: Makefile,v 1.109 2020/11/23 13:10:54 nia Exp $
 
-DISTNAME=	feh-3.4.1
+DISTNAME=	feh-3.5
 CATEGORIES=	graphics
 MASTER_SITES=	https://feh.finalrewind.org/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,6 +14,8 @@ USE_LANGUAGES=	c99
 
 USE_TOOLS+=	gmake
 
+CFLAGS+=	-DHAVE_STRING_H=1
+
 # for alphasort(3)
 CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
 
diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo
index d1b83c3f540..44d72f2c73c 100644
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.55 2020/06/13 18:25:08 nia Exp $
+$NetBSD: distinfo,v 1.56 2020/11/23 13:10:54 nia Exp $
 
-SHA1 (feh-3.4.1.tar.bz2) = bbad3635f34574f2e4ffd8bb129e21f806afa5a8
-RMD160 (feh-3.4.1.tar.bz2) = 716db47ef8f63c1dea11565afb1a19f4bf367130
-SHA512 (feh-3.4.1.tar.bz2) = d674d3134819cf6731aebf8af87a2f890d54dd7f8c64071e8816a032aeeb95c31f56752bb3477be0dfb653f813872b32dc2daf4e0514fed03e3f6bba36896c66
-Size (feh-3.4.1.tar.bz2) = 2114441 bytes
+SHA1 (feh-3.5.tar.bz2) = 76285400db14da5dc0f98d4b725442d6b5c347c1
+RMD160 (feh-3.5.tar.bz2) = c71fd836be138d717ee48aea67906eae804e9081
+SHA512 (feh-3.5.tar.bz2) = 69b4c73a8009c5b5e031bdf3c6a628da2f3cd71927d6c546ba2b2cfb6d10912e4a44e5d0de93704645a4dd33d71f1445749abe03383cc2298fa10c2d5d88fb5e
+Size (feh-3.5.tar.bz2) = 2115162 bytes
 SHA1 (patch-config.mk) = af7990e42c4c0a351c0d40eeb8221cd619ef72fb
+SHA1 (patch-src_getopt.c) = 1a91896a7bed8670fc44798308341633f818ebdc
+SHA1 (patch-src_gib__imlib.c) = 4f231e1bd8698e0bff796fab6b553649c31e1650
 SHA1 (patch-src_imlib_c) = 925d2536b69f99acc949cb6bd67422d001335492
+SHA1 (patch-src_wallpaper.c) = 8c1fcf000ef7ac7b690b0afbd64ef612e1fa3e34
diff --git a/graphics/feh/patches/patch-src_getopt.c b/graphics/feh/patches/patch-src_getopt.c
new file mode 100644
index 00000000000..524f4fcc9df
--- /dev/null
+++ b/graphics/feh/patches/patch-src_getopt.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_getopt.c,v 1.3 2020/11/23 13:10:54 nia Exp $
+
+Include string.h for strlen().
+
+--- src/getopt.c.orig	2020-08-29 06:50:28.000000000 +0000
++++ src/getopt.c
+@@ -97,6 +97,7 @@
+    they can distinguish the relative order of options and other arguments.  */
+ 
+ #include "getopt.h"
++#include <string.h>
+ 
+ /* For communication from `getopt' to the caller.
+    When `getopt' finds an option that takes an argument,
diff --git a/graphics/feh/patches/patch-src_gib__imlib.c b/graphics/feh/patches/patch-src_gib__imlib.c
new file mode 100644
index 00000000000..4f6a443839c
--- /dev/null
+++ b/graphics/feh/patches/patch-src_gib__imlib.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_gib__imlib.c,v 1.1 2020/11/23 13:10:54 nia Exp $
+
+ctype arguments must be unsigned char.
+
+--- src/gib_imlib.c.orig	2020-08-29 06:50:28.000000000 +0000
++++ src/gib_imlib.c
+@@ -514,7 +514,7 @@ gib_imlib_save_image(Imlib_Image im, cha
+      p = strdup(tmp + 1);
+      pp = p;
+      while(*pp) {
+-       *pp = tolower(*pp);
++       *pp = tolower((unsigned char)*pp);
+        pp++;
+      }
+      imlib_image_set_format(p);
+@@ -536,7 +536,7 @@ gib_imlib_save_image_with_error_return(I
+         p = estrdup(tmp + 1);
+         pp = p;
+         while(*pp) {
+-            *pp = tolower(*pp);
++            *pp = tolower((unsigned char)*pp);
+             pp++;
+         }
+         imlib_image_set_format(p);
diff --git a/graphics/feh/patches/patch-src_wallpaper.c b/graphics/feh/patches/patch-src_wallpaper.c
new file mode 100644
index 00000000000..27662cf169e
--- /dev/null
+++ b/graphics/feh/patches/patch-src_wallpaper.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_wallpaper.c,v 1.1 2020/11/23 13:10:54 nia Exp $
+
+ctype arguments must be unsigned char.
+
+--- src/wallpaper.c.orig	2020-08-29 06:50:28.000000000 +0000
++++ src/wallpaper.c
+@@ -625,7 +625,7 @@ int feh_wm_get_num_desks(void)
+ 		return(-1);
+ 	D(("Got from E IPC: %s\n", buf));
+ 	ptr = buf;
+-	while (ptr && !isdigit(*ptr))
++	while (ptr && !isdigit((unsigned char)*ptr))
+ 		ptr++;
+ 	desks = atoi(ptr);
+