<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8dc00f9f2ca9a3df116b087330b4197a37664d99">https://github.com/macports/macports-ports/commit/8dc00f9f2ca9a3df116b087330b4197a37664d99</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 8dc00f9f2ca inkscape: need cxx20 for poppler
</span>8dc00f9f2ca is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 8dc00f9f2ca9a3df116b087330b4197a37664d99
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Dec 16 10:34:41 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    inkscape: need cxx20 for poppler
</span>---
 graphics/inkscape/Portfile                         | 13 ++++++++-----
 graphics/inkscape/files/patch-cmake-use-cxx20.diff | 11 +++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/Portfile b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6685548bd3d..49551a35cd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,6 +46,9 @@ set python_version  ${python_major}${python_minor}
</span> patchfiles-append   libxml2-2.12.0.patch
 patchfiles-append   poppler-24.03.0.patch
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Since poppler now requires Cxx20, we must specify that to cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-cmake-use-cxx20.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
     reinplace "s|\"python-interpreter\", *\{\"python3\"|\"python-interpreter\", \{\"python${python_major}.${python_minor}\"|g" \
         ${worksrcpath}/src/extension/implementation/script.cpp
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,6 +66,9 @@ post-patch {
</span>         ${worksrcpath}/src/CMakeLists.txt
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Cxx20 now needed for poppler, as of v24.12.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Blacklist older Clang versions, for compilation errors:
 #   src/display/cairo-utils.cpp:
 #     No matching function for call to 'isnan'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,8 +80,8 @@ compiler.blacklist-append \
</span> 
 # Blacklist macports-clang-15+ to prevent
 #  error: no template named 'unary_function' in namespace 'std'
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    {macports-clang-1[5-9]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#                    {macports-clang-1[5-9]}
</span> 
 # Need no-invalid-constexpr, due to lib2geom. Remove if/when fixed in future
 if { [string match *clang* ${configure.compiler}] } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,9 +141,6 @@ depends_run-append \
</span>                     port:py${python_version}-numpy \
                     port:py${python_version}-scour
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    2017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append \
                     -DBUILD_TESTING=OFF \
                     -DENABLE_LCMS=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/files/patch-cmake-use-cxx20.diff b/graphics/inkscape/files/patch-cmake-use-cxx20.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4e49d5875a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/files/patch-cmake-use-cxx20.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig    2024-12-16 10:28:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2024-12-16 10:29:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CMake Configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(CMAKE_CXX_STANDARD 17)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(CMAKE_CXX_STANDARD 20)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++17 instead of -std=gnu++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 # TODO: build currently fails with it as we actually depend on GNU compiler extensions...
</span></pre><pre style='margin:0'>

</pre>