<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/712c0740383bf2f33c6196e5d4eb62d642196a55">https://github.com/macports/macports-ports/commit/712c0740383bf2f33c6196e5d4eb62d642196a55</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 712c0740383 gtkmm3: update to 3.24.7 See: https://trac.macports.org/ticket/65859
</span>712c0740383 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 712c0740383bf2f33c6196e5d4eb62d642196a55
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed May 17 09:07:54 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> gtkmm3: update to 3.24.7
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65859
</span>---
x11/gtkmm3/Portfile | 116 ++++++++++++---------
.../files/patch-meson-build-python-path.diff | 11 ++
2 files changed, 79 insertions(+), 48 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtkmm3/Portfile b/x11/gtkmm3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b7f2e691ad9..60ba31ea88c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtkmm3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtkmm3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,78 +2,98 @@
</span>
PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gtkmm3 > 3.16.0 requires C++11 or better
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name gtkmm3
set gname gtkmm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.24.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.24.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories x11 devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license LGPL-2.1+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {devans @dbevans} {mascguy @mascguy} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description C++ interface to GTK+ version 3.
long_description gtkmm3 is the official C++ interface \
for the popular GUI library GTK+ version 3.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {devans @dbevans} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories x11 devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license LGPL-2.1+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> homepage http://www.gtkmm.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnome:sources/${gname}/${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites gnome:sources/${gname}/${branch}/
</span> dist_subdir ${gname}
distname ${gname}-${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 48482c74a81f80d8b7b6168c0e38dedc73f39bcd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 13336236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 732c74a4d92b57dd5faf2f8a95c17a264a3bcb6c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1d7a35af9c5ceccacb244ee3c2deb9b245720d8510ac5c7e6f4b6f9947e6789c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 14813100
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mm-common \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_nodot [string map {. {}} ${py_ver}]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:glibmm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/cairomm-1.0.pc:cairomm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pangomm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:atkmm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk-doc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:json-glib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mm-common \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/atkmm-1.6.pc:atkmm-1.6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/cairomm-1.0.pc:cairomm-1.0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libepoxy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glibmm-2.4.pc:glibmm-2.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/pangomm-1.4.pc:pangomm-1.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python only needed for scripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python${py_ver_nodot}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Update glibtool to know about -stdlib=... in CXXFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.args -fvi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gtkmm3 > 3.16.0 requires C++11 or better
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# build using system perl
</span> configure.perl /usr/bin/perl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.python ${prefix}/bin/python${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PERL_PATH=${configure.perl}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# dummy variants to ensure that this port gets rebuilt if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the corresponding variants for gtk3 change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-atkmm-api=false
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 conflicts quartz {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant quartz conflicts x11 {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson-build-python-path.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|@@PYTHON@@|${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson.build
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants path:lib/pkgconfig/cairomm-1.0.pc:cairomm quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants pangomm quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk3 quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk3 "" quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/pkgconfig/cairomm-1.0.pc:cairomm-1.0 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/pkgconfig/pangomm-1.4.pc:pangomm-1.4 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/pkgconfig/gtk+-3.0.pc:gtk3 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-x11-api=true
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants path:lib/pkgconfig/cairomm-1.0.pc:cairomm x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants pangomm x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk3 x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk3 "" x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/pkgconfig/cairomm-1.0.pc:cairomm-1.0 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/pkgconfig/pangomm-1.4.pc:pangomm-1.4 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants path:lib/pkgconfig/gtk+-3.0.pc:gtk3 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-x11-api=false
</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 {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</span> }
livecheck.type gnome
livecheck.name ${gname}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex {LATEST-IS-(3\.\d*[02468](?:.\d+)*)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtkmm3/files/patch-meson-build-python-path.diff b/x11/gtkmm3/files/patch-meson-build-python-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2b23856c7dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtkmm3/files/patch-meson-build-python-path.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;'>+--- meson.build.orig 2023-05-01 08:54:26.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2023-05-01 08:54:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpp_compiler = meson.get_compiler('cpp')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is_msvc = cpp_compiler.get_id() == 'msvc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ is_host_windows = host_machine.system() == 'windows'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-python3 = import('python').find_installation()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++python3 = import('python').find_installation('@@PYTHON@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_version = python3.language_version()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_version_req = '>= 3.5'
</span></pre><pre style='margin:0'>
</pre>