<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3ee42f231976a06c844c0b4dd7e2e864806b5989">https://github.com/macports/macports-ports/commit/3ee42f231976a06c844c0b4dd7e2e864806b5989</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 3ee42f23197 ImageMagick7: Avoid requiring C++11 compiler
</span>3ee42f23197 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3ee42f231976a06c844c0b4dd7e2e864806b5989
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Thu Apr 4 17:55:36 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> ImageMagick7: Avoid requiring C++11 compiler
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: #23337
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also suppress strchr implicit function declaration warning, fix notes,
</span><span style='display:block; white-space:pre;color:#404040;'> and use path dependency for pkgconfig.
</span>---
graphics/ImageMagick7/Portfile | 19 +++++++++++--------
graphics/ImageMagick7/files/Color.cpp.patch | 14 ++++++++++++++
2 files changed, 25 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ImageMagick7/Portfile b/graphics/ImageMagick7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf46a8e8bb1..899cbd77d42 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ImageMagick7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ImageMagick7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,10 +80,12 @@ depends_lib port:bzip2 \
</span> port:libheif
# Magick-config etc. use pkg-config
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:bin/pkg-config:pkgconfig
</span>
depends_run port:urw-fonts
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append Color.cpp.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # error: wrong number of arguments specified for 'deprecated' attribute
compiler.blacklist-append \
{*gcc-[34].*}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,6 +142,9 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/wiki/WimplicitFunctionDeclaration#strchr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.checks.implicit_function_declaration.whitelist-append strchr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
test.target check
test.env DYLD_LIBRARY_PATH=${worksrcpath}/magick/.libs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -182,13 +187,11 @@ variant x11 {
</span> default_variants +x11
notes-append {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To use the ImageMagic-7 command-line interface, add
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${prefix}/lib/ImageMagick7/bin to your $PATH,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To use the ImageMagick7 command-line interface, add\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+${prefix}/lib/ImageMagick7/bin to your $PATH,\
</span> in front of the normal ${prefix}; or else use full paths.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To compile and link with ImageMagic-7, add
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--I${prefix}/lib/ImageMagick7/include and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To compile and link with ImageMagick7, add\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-I${prefix}/lib/ImageMagick7/include and\
</span> -L${prefix}/lib/ImageMagick7/lib to your compile command.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---------
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ImageMagick7/files/Color.cpp.patch b/graphics/ImageMagick7/files/Color.cpp.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b016646a819
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ImageMagick7/files/Color.cpp.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Avoid using the C++11-specific nullptr.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ImageMagick/ImageMagick6/issues/319
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ImageMagick/ImageMagick/commit/9cf419c6eb5e64b3571d98938a4a6627ac55be42
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Magick++/lib/Color.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Magick++/lib/Color.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -243,7 +243,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _isValid = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _pixelOwn = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete _pixel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _pixel = nullptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _pixel = (PixelPacket *)NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ThrowPPException(false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>