<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e7356b06de044d31cf55250785bbeb058a3865a4">https://github.com/macports/macports-ports/commit/e7356b06de044d31cf55250785bbeb058a3865a4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e7356b06de0 feh: update to 3.8; fix +universal
</span>e7356b06de0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e7356b06de044d31cf55250785bbeb058a3865a4
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Sat Jan 8 08:27:20 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> feh: update to 3.8; fix +universal
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use patch provided by johnrosshunt(@gmail.com) in #59701. I can only
</span><span style='display:block; white-space:pre;color:#404040;'> test on 12.1 system; both -universal and + universal work.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/59701
</span><span style='display:block; white-space:pre;color:#404040;'> closes https://trac.macports.org/ticket/62776
</span>---
graphics/feh/Portfile | 30 ++++++++++++++++++++++--------
graphics/feh/files/patch-invalid-c99.diff | 12 ++++++++++++
2 files changed, 34 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/feh/Portfile b/graphics/feh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 915c0172d36..253cc504867 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/feh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/feh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span>
name feh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories graphics
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +20,11 @@ homepage https://feh.finalrewind.org/
</span> master_sites ${homepage}
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 af6c251ea98cdd53d9fa4dd603e795b1e4a27259 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8f9741399b4b184ba28698c0fd7722638e79abac8e6c27eb526cc52b11ee0a1c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2112281
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b7572041c7b68c8634fed241f25b8f1754a0bd44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7f3c34552b39336d7ebee2d7c4bf5697aaaa2c6c102c357f6e82ea240bd62ba9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2122631
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-invalid-c99.diff
</span>
depends_lib-append port:curl \
port:imlib2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,18 +42,29 @@ post-extract {
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # exif=1 - enable auto-rotate
# verscmp=0 - disable strverscmp
build.args PREFIX=${prefix} \
'exif=1' \
'verscmp=0'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs_supported} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CFLAGS=${configure.cflags} [muniversal_get_arch_flag ${arch}]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS=${configure.cppflags} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [muniversal_get_arch_flag ${arch}]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env CC=${configure.cc} \
</span> "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
CPPFLAGS=${configure.cppflags} \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.args PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/feh/files/patch-invalid-c99.diff b/graphics/feh/files/patch-invalid-c99.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3d7c42e98b3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/feh/files/patch-invalid-c99.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/imlib.c 2022-01-03 05:34:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/imlib.c 2022-01-07 19:17:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,6 +46,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "exif.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++char *mkdtemp(char *);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int mkstemps(char *, int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Display *disp = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Visual *vis = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Screen *scr = NULL;
</span></pre><pre style='margin:0'>
</pre>