<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/f6b7b4f17cf3d80f36206efd23cd3ff1d433ac6e">https://github.com/macports/macports-ports/commit/f6b7b4f17cf3d80f36206efd23cd3ff1d433ac6e</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 f6b7b4f17cf inkscape: revert cxx20 change
</span>f6b7b4f17cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f6b7b4f17cf3d80f36206efd23cd3ff1d433ac6e
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Dec 16 11:55:31 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> inkscape: revert cxx20 change
</span>---
graphics/inkscape/Portfile | 13 +++++--------
graphics/inkscape/files/patch-cmake-use-cxx20.diff | 11 -----------
2 files changed, 5 insertions(+), 19 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 49551a35cd4..6685548bd3d 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,9 +46,6 @@ 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:#ffe0e0;'>-# Since poppler now requires Cxx20, we must specify that to cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-cmake-use-cxx20.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>@@ -66,9 +63,6 @@ post-patch {
</span> ${worksrcpath}/src/CMakeLists.txt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Cxx20 now needed for poppler, as of v24.12.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2020
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>@@ -80,8 +74,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;'>@@ -141,6 +135,9 @@ depends_run-append \
</span> port:py${python_version}-numpy \
port:py${python_version}-scour
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4e49d5875a0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/files/patch-cmake-use-cxx20.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2024-12-16 10:28:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2024-12-16 10:29:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CMake Configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set(CMAKE_CXX_STANDARD 17)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(CMAKE_CXX_STANDARD 20)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_STANDARD_REQUIRED ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # set(CMAKE_CXX_EXTENSIONS OFF) # enforces -std=c++17 instead of -std=gnu++17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: build currently fails with it as we actually depend on GNU compiler extensions...
</span></pre><pre style='margin:0'>
</pre>