<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/472274aa8d3e090391eec74d152c348cc4399042">https://github.com/macports/macports-ports/commit/472274aa8d3e090391eec74d152c348cc4399042</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 472274aa8d3e090391eec74d152c348cc4399042
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jan 8 16:18:23 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> feh: Improve implicit function declaration fix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62776
</span>---
graphics/feh/Portfile | 4 ++--
graphics/feh/files/implicit.patch | 25 +++++++++++++++++++++++++
graphics/feh/files/patch-invalid-c99.diff | 12 ------------
3 files changed, 27 insertions(+), 14 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 253cc504867..7facc7c0975 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;'>@@ -24,8 +24,6 @@ checksums rmd160 b7572041c7b68c8634fed241f25b8f1754a0bd44 \
</span> sha256 7f3c34552b39336d7ebee2d7c4bf5697aaaa2c6c102c357f6e82ea240bd62ba9 \
size 2122631
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-invalid-c99.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append port:curl \
port:imlib2 \
path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +38,8 @@ post-extract {
</span> system "chmod -R 755 ${worksrcpath}"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
# exif=1 - enable auto-rotate
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/feh/files/implicit.patch b/graphics/feh/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..319556ef167
</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/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'mkdtemp' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'mkstemps' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/derf/feh/pull/647
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/imlib.c.orig 2022-01-03 04:34:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/imlib.c 2022-01-08 15:49:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netinet/in.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <arpa/inet.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <netdb.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_LIBCURL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <curl/curl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.mk.orig 2022-01-03 04:34:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.mk 2022-01-08 15:57:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -Wall -Wextra -pedantic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Settings for glibc >= 2.19 - may need to be adjusted for other systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS += -std=c11 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -std=c11 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (${curl},1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS += -DHAVE_LIBCURL
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3d7c42e98b3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/feh/files/patch-invalid-c99.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/imlib.c 2022-01-03 05:34:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/imlib.c 2022-01-07 19:17:59.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,6 +46,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "exif.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+char *mkdtemp(char *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int mkstemps(char *, int);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Display *disp = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Visual *vis = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Screen *scr = NULL;
</span></pre><pre style='margin:0'>
</pre>