<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/cbb46cf8b5e79d10445fd903ef5e03fd390c8e1e">https://github.com/macports/macports-ports/commit/cbb46cf8b5e79d10445fd903ef5e03fd390c8e1e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cbb46cf8b5e79d10445fd903ef5e03fd390c8e1e
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Jun 6 14:15:48 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    lib2geom: update to 1.3
</span><span style='display:block; white-space:pre;color:#404040;'>    - Patch upstream's CMakeLists.txt, to allow disabling Cython/GTK3
</span><span style='display:block; white-space:pre;color:#404040;'>    - Bump boost to 1.80
</span><span style='display:block; white-space:pre;color:#404040;'>    - Add deps gettext*, ragel
</span>---
 graphics/lib2geom/Portfile                       | 36 ++++++++++++++++++------
 graphics/lib2geom/files/patch-cmake-options.diff | 31 ++++++++++++++++++++
 2 files changed, 58 insertions(+), 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/lib2geom/Portfile b/graphics/lib2geom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 346e3687289..f57543466aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/lib2geom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/lib2geom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup       gitlab 1.0
</span> PortGroup       cmake 1.1
 PortGroup       boost 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gitlab.setup    inkscape lib2geom 1.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup    inkscape lib2geom 1.3
</span> revision        0
 
 categories      graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,32 +18,50 @@ long_description \
</span>                 ${description} It concentrates on high-level algorithms, such as \
                 computing the length of a curve or Boolean operations on paths.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums       rmd160  e420e714a458af3a58058c40f41dc8acc0209abf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                sha256  1c22a7be571d2e2f3ee98424614ffd6a42fe73dedbd2ccfb0967ecb02f77edeb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                size    1231577
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums       rmd160  c4b55dae72b49fb5dfd687f747b0a2227bbb5d9d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                sha256  bd07f2a1322fcad16a55a1901207faa55dffdecebc56a00eabd4575f62e043c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                size    1275751
</span> 
 # this port only uses boost headers during build
 # and does not link with any boost libraries
 # no need to rebuild due to boost library ABI changes
 boost.depends_type build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.version      1.76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+boost.version      1.80
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch to expose formal options for: Cython, GTK3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Otherwise, those will be opportunistically pulled in, which we don't want.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                patch-cmake-options.diff
</span> 
 depends_build-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                port:gettext \
</span>                 port:pkgconfig
 
 depends_lib-append \
                 path:lib/pkgconfig/cairo.pc:cairo \
                 port:double-conversion \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                port:gettext-runtime \
</span>                 path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gsl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                port:gsl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                port:ragel
</span> 
 # C++17 is required
 compiler.cxx_standard 2017
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Need no-invalid-constexpr for v1.3. Remove if/when fixed in future.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [string match *clang* ${configure.compiler}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -Wno-invalid-constexpr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -Wno-error=unknown-warning-option \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -Wno-unknown-warning-option
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                -D2GEOM_BUILD_SHARED=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                -D2GEOM_TESTING=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                -D2GEOM_USE_GPL_CODE=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -D2GEOM_BUILD_SHARED:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -D2GEOM_TESTING:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -D2GEOM_USE_GPL_CODE:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -DWITH_CYTHON:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                -DWITH_GTK3:BOOL=OFF
</span> 
 # Our Inkscape port, v1.2.2 - revisions 0 and 1 - install a public copy of lib2geom.
 # So we must forcibly deactivate Inkscape first, and prompt the user to upgrade.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/lib2geom/files/patch-cmake-options.diff b/graphics/lib2geom/files/patch-cmake-options.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..183182a2597
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/lib2geom/files/patch-cmake-options.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig    2023-06-06 13:26:05.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-06-06 13:36:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,13 +30,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(GNUInstallDirs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(CheckCXXSourceCompiles)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option(WITH_CYTHON "Build lib2geom with Cython enabled" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option(WITH_GTK3 "Build lib2geom with GTK3 enabled" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Boost 1.60 REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(DoubleConversion REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(PkgConfig REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package(Cython)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Threads)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (WITH_CYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++find_package(Cython)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "Cython: DISABLED")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif (WITH_CYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (WITH_GTK3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_check_modules(GTK3 gtk+-3.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MESSAGE(STATUS "GTK3: DISABLED")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif (WITH_GTK3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_check_modules(GLIB REQUIRED glib-2.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_check_modules(CAIRO cairo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkg_check_modules(GSL REQUIRED gsl)
</span></pre><pre style='margin:0'>

</pre>