<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/098d5fa42df6a82735b3a0ec175264f66cfa82e0">https://github.com/macports/macports-ports/commit/098d5fa42df6a82735b3a0ec175264f66cfa82e0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 098d5fa42df6a82735b3a0ec175264f66cfa82e0
</span>Author: Steve Langer <stephen.langer@nist.gov>
AuthorDate: Wed Sep 20 20:03:06 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> oofcanvas: Update to version 1.1.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now using python 3. This version is required for oof2 2.3.1.
</span>---
graphics/oofcanvas/Portfile | 68 ++++++++++++++++++++++++++++++++-------------
1 file changed, 49 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/oofcanvas/Portfile b/graphics/oofcanvas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dc5661847a1..0c88f813c75 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/oofcanvas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/oofcanvas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup compiler_blacklist_versions 1.0
name oofcanvas
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.1
</span> revision 0
license public-domain
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,35 +28,65 @@ long_description OOFCanvas is a replacement for libgnomecanvas, designed \
</span> homepage https://www.ctcms.nist.gov/oof/oofcanvas
master_sites ${homepage}/source
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f7f25039414ea999c2c6027789d6d196ea76549b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 30d738e5047d46008363265ce50eac10cdadbed3b3430904a031f60139d9796f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1112119
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6fc895f62482b8e616952555a8945c71b84c0762 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 78e14ac9226bf5831ff0a90a39d31cd0fb80e055a0ce92ddbf3b834a46960bad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 98484
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.build_type Release
</span>
# clang 503.0.40 provided by Xcode 5.1.1 supports C++11 but apparently not <type_traits>
# fatal error: 'type_traits' file not found
# #include <type_traits>
compiler.blacklist-append {clang < 600.0.57}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:cmake port:pkgconfig port:swig-python
</span>
depends_lib-append path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:cairomm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:adwaita-icon-theme
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cairomm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DOOFCANVAS_SWIG_VERSION=4.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_versions {311 38 310 39}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set minor [string range ${v} 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This variant conflicts with all other python variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conflictversions [lsearch -all -inline -not ${python_versions} $v]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conflictswith {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach cv ${conflictversions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend conflictswith python$cv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant python${v} description "Build the API for Python 3.${minor}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts {*}$conflictswith \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ subst {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:python${v} port:py${v}-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOOFCANVAS_PYTHON_API=Python3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOOFCANVAS_PYTHON3_VERSION=3.$minor \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOOFCANVAS_SYSTEM_INSTALL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant magick description {Add support for ImageMagick images} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOOFCANVAS_USE_IMAGEMAGICK=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:ImageMagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant pythonAPI description {Build the python API} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append --pythonAPI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append --pythonAPI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py${python.version}-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant numpy description {Add support for NumPy images (at your own risk)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOOFCANVAS_USE_NUMPY=ON
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant magick description {Include code to display ImageMagick images} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append --magick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append --magick
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:ImageMagick
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# python311 is the default variant if no other python variant is set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set vactive 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if [variant_isset python$v] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vactive 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { !$vactive } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +magick +python311
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +magick
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +pythonAPI +magick
</span></pre><pre style='margin:0'>
</pre>