Here's an update to the newest release:
* Fix broken thumbnail/index windows when using --scale-down
* Use Imlib2 in-memory image cache (default cache size: 4MiB). This allows
for significant performance improvements especially in small slideshows
* Add --cache-size option to set Imlib2 image cache size
* Fix HTTPS certificate errors on some systems (broken in 2.22)
* Allow ~/.fehbg to be sourced (instead of executed) from other shell
scripts again (broken in 2.22)
* Add support for CURL_CA_BUNDLE environment variable when loading images
via HTTPS
* Fix ~/.fehbg not being updated when setting a wallpaper via menu
(broken in 2.21)
* Add toggle_fixed_geometry ('g') key binding to toggle window auto-resize
* Improve control via terminal input
* Fix crash (segmentation fault) when using feh -O in non-index mode
* Fix --force-aliasing (and possibly other options) missing from ~/.fehbg
when using them for background setting
The EXIF hunk in patch-config_mk got moved to MAKE_FLAGS.
System includes needed to be moved before local ones.
glibc specific CFLAGS had to be removed, there is no object change when
compiling without `-std=c11' so I left those out completely.
With my new devel/p5-Test-Command port submitted earlier we can also
enable headless tests, which all succeed on my amd64 machine except for
mandoc linting. This is both due to our mandoc(1) not having `-V' and
actual markup issues in their manpages, see attached test.log.
Works fine for me on amd64, but I have yet to communicate with upstream
regarding the patches.
Feedback?
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/feh/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile 7 Dec 2017 13:12:44 -0000 1.88
+++ Makefile 29 Jan 2018 00:37:25 -0000
@@ -2,12 +2,12 @@
COMMENT= lightweight image viewer
-DISTNAME= feh-2.20
+DISTNAME= feh-2.23
EXTRACT_SUFX= .tar.bz2
CATEGORIES= graphics
FIX_EXTRACT_PERMISSIONS=Yes
-HOMEPAGE= http://feh.finalrewind.org/
+HOMEPAGE= https://feh.finalrewind.org/
MAINTAINER= David Coppa <dco...@openbsd.org>
@@ -24,17 +24,17 @@ LIB_DEPENDS= graphics/imlib2 \
RUN_DEPENDS+= devel/desktop-file-utils \
x11/gtk+3,-guic
+TEST_DEPENDS= devel/p5-Test-Command
CFLAGS+= -I${LOCALBASE}/include \
-I${X11BASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
MAKE_FLAGS= LDFLAGS="${LDFLAGS}" man_dir="${DESTDIR}${PREFIX}/man" \
- example_dir="${DESTDIR}${PREFIX}/share/examples/feh"
+ example_dir="${DESTDIR}${PREFIX}/share/examples/feh" \
+ exif=1
FAKE_FLAGS= PREFIX="${PREFIX}"
USE_GMAKE= Yes
-
-NO_TEST= Yes
post-configure:
${SUBST_CMD} ${WRKSRC}/examples/themes ${WRKSRC}/man/feh.pre \
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/feh/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- distinfo 8 Sep 2017 08:19:20 -0000 1.55
+++ distinfo 29 Jan 2018 00:37:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (feh-2.20.tar.bz2) = S1BDAgmext0JnITdfihcgNwxiXfr2kiUlZM4a8JucAs=
-SIZE (feh-2.20.tar.bz2) = 2129466
+SHA256 (feh-2.23.tar.bz2) = Ft88uBNSalSehUqoL4C8spm56D3Wh6tCFqhOhvYXIqE=
+SIZE (feh-2.23.tar.bz2) = 2130344
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/graphics/feh/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile
--- patches/patch-Makefile 9 Jun 2017 10:20:22 -0000 1.6
+++ patches/patch-Makefile 29 Jan 2018 00:37:25 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile,v 1.6 2017/06/0
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -90,6 +90,7 @@ install-examples:
+@@ -91,6 +91,7 @@ install-examples:
@echo installing examples to ${example_dir}
@mkdir -p ${example_dir}
@cp examples/* ${example_dir}
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/graphics/feh/patches/patch-config_mk,v
retrieving revision 1.8
diff -u -p -r1.8 patch-config_mk
--- patches/patch-config_mk 30 Aug 2016 14:44:37 -0000 1.8
+++ patches/patch-config_mk 29 Jan 2018 00:37:25 -0000
@@ -1,25 +1,20 @@
-$OpenBSD: patch-config_mk,v 1.8 2016/08/30 14:44:37 dcoppa Exp $
+$OpenBSD$
zap redundant CFLAGS
-enable builtin EXIF support
+fix "filelist.c:253:45: error: use of undeclared identifier 'alphasort'"
---- config.mk.orig Sun Aug 28 22:25:42 2016
-+++ config.mk Tue Aug 30 16:29:18 2016
-@@ -7,7 +7,7 @@ curl ?= 1
- debug ?= 0
- help ?= 0
- xinerama ?= 1
--exif ?= 0
-+exif ?= 1
-
- # Prefix for all installed files
- PREFIX ?= /usr/local
-@@ -32,7 +32,6 @@ scalable_icon_dir = ${icon_dir}/scalable/apps
+Index: config.mk
+--- config.mk.orig
++++ config.mk
+@@ -35,10 +35,6 @@ scalable_icon_dir = ${icon_dir}/scalable/apps
# default CFLAGS
CFLAGS ?= -g -O2
-CFLAGS += -Wall -Wextra -pedantic
+-
+-# Settings for glibc >= 2.19 - may need to be adjusted for other systems
+-CFLAGS += -std=c11 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500
ifeq (${curl},1)
CFLAGS += -DHAVE_LIBCURL
Index: patches/patch-man_feh_pre
===================================================================
RCS file: /cvs/ports/graphics/feh/patches/patch-man_feh_pre,v
retrieving revision 1.40
diff -u -p -r1.40 patch-man_feh_pre
--- patches/patch-man_feh_pre 8 Sep 2017 08:19:20 -0000 1.40
+++ patches/patch-man_feh_pre 29 Jan 2018 00:37:25 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-man_feh_pre,v 1.40 2017/
Index: man/feh.pre
--- man/feh.pre.orig
+++ man/feh.pre
-@@ -1073,7 +1073,7 @@ which
+@@ -1083,7 +1083,7 @@ which
defaults to
.Pa ~/.config/feh/ .
If the files are not found in that directory, it will also try
@@ -11,7 +11,7 @@ Index: man/feh.pre
.Pp
All config files treat lines starting with a
.Qq #
-@@ -1651,56 +1651,56 @@ Here are some examples of useful option combinations.
+@@ -1665,56 +1665,56 @@ Here are some examples of useful option combinations.
.
.Bl -tag -width indent
.
@@ -85,7 +85,7 @@ Index: man/feh.pre
~/image/image_name when enter is pressed
.
.It feh --start-at ./foo.jpg \&.
-@@ -1745,8 +1745,6 @@ section.
+@@ -1759,8 +1759,6 @@ section.
.
.
.Sh BUGS
Index: patches/patch-src_events_c
===================================================================
RCS file: /cvs/ports/graphics/feh/patches/patch-src_events_c,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_events_c
--- patches/patch-src_events_c 30 Aug 2016 14:44:37 -0000 1.10
+++ patches/patch-src_events_c 29 Jan 2018 00:37:25 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_events_c,v 1.10 2016/08/30 14:44:37 dcoppa Exp $
---- src/events.c.orig Sun Aug 28 22:25:42 2016
-+++ src/events.c Tue Aug 30 16:28:12 2016
-@@ -123,7 +123,7 @@ void init_buttonbindings(void)
+Index: src/events.c
+--- src/events.c.orig
++++ src/events.c
+@@ -124,7 +124,7 @@ void init_buttonbindings(void)
free(confpath);
Index: patches/patch-src_keyevents_c
===================================================================
RCS file: /cvs/ports/graphics/feh/patches/patch-src_keyevents_c,v
retrieving revision 1.15
diff -u -p -r1.15 patch-src_keyevents_c
--- patches/patch-src_keyevents_c 8 Sep 2017 08:19:20 -0000 1.15
+++ patches/patch-src_keyevents_c 29 Jan 2018 00:37:25 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_keyevents_c,v 1.15 2
Index: src/keyevents.c
--- src/keyevents.c.orig
+++ src/keyevents.c
-@@ -183,7 +183,7 @@ void init_keyevents(void) {
+@@ -225,7 +225,7 @@ void init_keyevents(void) {
free(confpath);
Index: patches/patch-src_options_c
===================================================================
RCS file: /cvs/ports/graphics/feh/patches/patch-src_options_c,v
retrieving revision 1.13
diff -u -p -r1.13 patch-src_options_c
--- patches/patch-src_options_c 8 Sep 2017 08:19:20 -0000 1.13
+++ patches/patch-src_options_c 29 Jan 2018 00:37:25 -0000
@@ -1,8 +1,24 @@
$OpenBSD: patch-src_options_c,v 1.13 2017/09/08 08:19:20 dcoppa Exp $
+
+Fix conflicting types for 'str{r,}chr'.
+
Index: src/options.c
--- src/options.c.orig
+++ src/options.c
-@@ -156,7 +156,7 @@ static void feh_load_options_for_theme(char *theme)
+@@ -24,10 +24,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALI
+
+ */
+
++#include <strings.h>
++
+ #include "feh.h"
+ #include "filelist.h"
+ #include "options.h"
+-#include <strings.h>
+
+ static void check_options(void);
+ static void feh_getopt_theme(int argc, char **argv);
+@@ -158,7 +159,7 @@ static void feh_load_options_for_theme(char *theme)
free(oldrcpath);
