Re: UPDATE: graphics/feh 2.20 -> 2.23.1

[Klemens Nanni]

On Fri, Feb 02, 2018 at 02:36:33PM +0100, Klemens Nanni wrote:
> On Wed, Jan 31, 2018 at 08:06:54PM +, Stuart Henderson wrote:
> > On 2018/01/31 20:54, Klemens Nanni wrote:
> > > * The Makefile no longer honors CPPFLAGS and instead consistently uses 
> > > CFLAGS for user-provided include paths
> > 
> > CPPFLAGS would usually be the better place for include paths ...
> Same goes for `-D_VAR=1' but you'll find inconsistent usage in nearly
> all projects.
> 
> Is this a blocker for you? I'd like to get this update in.
> 
Now with devel/p5-Test-Command in tree:

All tests successful.
Files=2, Tests=74,  1 wallclock secs ( 0.04 usr  0.06 sys +  0.20 cusr  
0.43 csys =  0.73 CPU)
Result: PASS

Haven't heard from MAINTAINER so far since 29.01.2018.

OK?

Index: Makefile
===
RCS file: /cvs/ports/graphics/feh/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile7 Dec 2017 13:12:44 -   1.88
+++ Makefile11 Feb 2018 15:30:24 -
@@ -2,12 +2,12 @@
 
 COMMENT=   lightweight image viewer
 
-DISTNAME=  feh-2.20
+DISTNAME=  feh-2.23.1
 EXTRACT_SUFX=  .tar.bz2
 CATEGORIES=graphics
 FIX_EXTRACT_PERMISSIONS=Yes
 
-HOMEPAGE=  http://feh.finalrewind.org/
+HOMEPAGE=  https://feh.finalrewind.org/
 
 MAINTAINER=David Coppa 
 
@@ -24,21 +24,21 @@ 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"
+MAKE_FLAGS=LDFLAGS="${LDFLAGS}" \
+   man_dir="${DESTDIR}${PREFIX}/man" \
+   example_dir="${DESTDIR}${PREFIX}/share/examples/feh" \
+   exif=1
 FAKE_FLAGS=PREFIX="${PREFIX}"
 
 USE_GMAKE= Yes
 
-NO_TEST=   Yes
-
-post-configure:
+pre-configure:
${SUBST_CMD} ${WRKSRC}/examples/themes ${WRKSRC}/man/feh.pre \
-   ${WRKSRC}/src/events.c ${WRKSRC}/src/keyevents.c \
-   ${WRKSRC}/src/options.c
+   ${WRKSRC}/src/{events,keyevents,options}.c
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/graphics/feh/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- distinfo8 Sep 2017 08:19:20 -   1.55
+++ distinfo11 Feb 2018 15:30:24 -
@@ -1,2 +1,2 @@
-SHA256 (feh-2.20.tar.bz2) = S1BDAgmext0JnITdfihcgNwxiXfr2kiUlZM4a8JucAs=
-SIZE (feh-2.20.tar.bz2) = 2129466
+SHA256 (feh-2.23.1.tar.bz2) = m8Fk0IY9QSAb0lOiZS3O5YBqnGqLWRi7i6CfzubX6b4=
+SIZE (feh-2.23.1.tar.bz2) = 2130373
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 -   1.6
+++ patches/patch-Makefile  11 Feb 2018 15:30:24 -
@@ -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 -  1.8
+++ patches/patch-config_mk 11 Feb 2018 15:30:24 -
@@ -2,24 +2,19 @@ $OpenBSD: patch-config_mk,v 1.8 2016/08/
 
 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=700
  
  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 

Re: UPDATE: graphics/feh 2.20 -> 2.23.1

[Klemens Nanni]

On Wed, Jan 31, 2018 at 08:06:54PM +, Stuart Henderson wrote:
> On 2018/01/31 20:54, Klemens Nanni wrote:
> > * The Makefile no longer honors CPPFLAGS and instead consistently uses 
> > CFLAGS for user-provided include paths
> 
> CPPFLAGS would usually be the better place for include paths ...
Same goes for `-D_VAR=1' but you'll find inconsistent usage in nearly
all projects.

Is this a blocker for you? I'd like to get this update in.

Re: UPDATE: graphics/feh 2.20 -> 2.23.1

[Stuart Henderson]

On 2018/01/31 20:54, Klemens Nanni wrote:
> * The Makefile no longer honors CPPFLAGS and instead consistently uses CFLAGS 
> for user-provided include paths

CPPFLAGS would usually be the better place for include paths ...

Re: UPDATE: graphics/feh 2.20 -> 2.23.1

[Klemens Nanni]

On Mon, Jan 29, 2018 at 02:03:53AM +0100, Klemens Nanni wrote:
> 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.
New 2.23.1 release after I got all our patches (except the SUBST bits)
merged upstream:

* The Makefile no longer honors CPPFLAGS and instead consistently uses CFLAGS 
for user-provided include paths
* Fix %u format specifier in multiwindow and list modes (patch by ulteq)
* Minor performance improvements (patches by ulteq)
* Stability improvements when using --magick-timeout (patch by ulteq)

I also took the liberty to squash the SUBST_CMD invocation a bit while
moving it from post- to pre-configure.

Test are ok, upstream checks for `mandoc -V' but would throw lots of
mandoc linter warnings anyway. They're working on it.

test/feh.t . ok
usage: mandoc [-ac] [-I os=name] [-K encoding] [-mdoc | -man] [-O 
options]
  [-T output] [-W level] [file ...]
# mandoc not installed, test skipped. This is NOT fatal.
test/mandoc.t .. ok
All tests successful.
Files=2, Tests=74,  1 wallclock secs ( 0.02 usr  0.05 sys +  0.23 cusr  
0.45 csys =  0.75 CPU)
Result: PASS

Feedback? Any takers?

Index: Makefile
===
RCS file: /cvs/ports/graphics/feh/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile7 Dec 2017 13:12:44 -   1.88
+++ Makefile31 Jan 2018 19:51:38 -
@@ -2,12 +2,12 @@
 
 COMMENT=   lightweight image viewer
 
-DISTNAME=  feh-2.20
+DISTNAME=  feh-2.23.1
 EXTRACT_SUFX=  .tar.bz2
 CATEGORIES=graphics
 FIX_EXTRACT_PERMISSIONS=Yes
 
-HOMEPAGE=  http://feh.finalrewind.org/
+HOMEPAGE=  https://feh.finalrewind.org/
 
 MAINTAINER=David Coppa 
 
@@ -24,21 +24,20 @@ 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:
+pre-configure:
${SUBST_CMD} ${WRKSRC}/examples/themes ${WRKSRC}/man/feh.pre \
-   ${WRKSRC}/src/events.c ${WRKSRC}/src/keyevents.c \
-   ${WRKSRC}/src/options.c
+   ${WRKSRC}/src/{events,keyevents,options}.c
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/graphics/feh/distinfo,v
retrieving revision 1.55
diff -u -p -r1.55 distinfo
--- distinfo8 Sep 2017 08:19:20 -   1.55
+++ distinfo31 Jan 2018 19:51:38 -
@@ -1,2 +1,2 @@
-SHA256 (feh-2.20.tar.bz2) = S1BDAgmext0JnITdfihcgNwxiXfr2kiUlZM4a8JucAs=
-SIZE (feh-2.20.tar.bz2) = 2129466
+SHA256 (feh-2.23.1.tar.bz2) = m8Fk0IY9QSAb0lOiZS3O5YBqnGqLWRi7i6CfzubX6b4=
+SIZE (feh-2.23.1.tar.bz2) = 2130373
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/graphics/feh/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -p -r1.6