<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/7125688388a3f2f2bca18ff7c4347299966ed971">https://github.com/macports/macports-ports/commit/7125688388a3f2f2bca18ff7c4347299966ed971</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 7125688388a glibmm-devel: update to 2.70.0
</span>7125688388a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7125688388a3f2f2bca18ff7c4347299966ed971
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Sep 16 14:29:38 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> glibmm-devel: update to 2.70.0
</span>---
devel/glibmm-devel/Portfile | 76 ++++++++++++++--------
.../files/patch-meson-build-python-path.diff | 11 ++++
devel/glibmm-devel/files/patch-no_cocoa.diff | 11 ----
3 files changed, 61 insertions(+), 37 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glibmm-devel/Portfile b/devel/glibmm-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fa39019512d..a41e6091838 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glibmm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glibmm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,51 +2,69 @@
</span>
PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name glibmm-devel
conflicts glibmm
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name glibmm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this version should match glib2, as closely as possible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.70.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# this version should match glib2-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.62.0
</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:#ffe0e0;'>-description C++ interface to glib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span> categories devel x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mascguy @mascguy} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description C++ interface to glib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span> homepage http://www.gtkmm.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname glibmm-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnome:sources/glibmm/${branch}/
</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/${my_name}/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${my_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${my_name}-${version}
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 440f4c2edcc7501917df1d6cd344697f95d7e727 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7398144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4b1387995e24640d59658e4285d2bc2f07e77d1c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8008fd8aeddcc867a3f97f113de625f6e96ef98cf7860379813a9c0feffdb520 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7874312
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.10
</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_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span> port:mm-common
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# this version of glibmm is meant to match only glib2-devel; glib2 is too old
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:glib2-devel \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libsigcxx2
</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/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libsigcxx3 \
</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>
# glibmm > 2.44.0 requires C++11 or better
compiler.cxx_standard 2011
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:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dmaintainer-mode=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-documentation=false
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mmdoctooldir ${prefix}/share/glibmm-2.4/doctool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${mmdoctooldir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath}/docs doc-install.pl doc-postprocess.pl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tagfile-to-devhelp2.xsl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${mmdoctooldir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath}/docs/reference/html doxygen.css \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${mmdoctooldir}
</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:#e0ffe0;'>+
</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> }
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,14 +73,20 @@ variant quartz conflicts x11 {
</span>
variant x11 conflicts quartz {
require_active_variants port:glib2-devel x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-no_cocoa.diff
</span> }
if {![variant_isset quartz]} {
default_variants +x11
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Either +x11 or +quartz is required"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
test.run yes
test.target check
livecheck.type gnome
<span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.name ${my_name}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glibmm-devel/files/patch-meson-build-python-path.diff b/devel/glibmm-devel/files/patch-meson-build-python-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1666a7aef7c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glibmm-devel/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 2022-09-16 14:01:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2022-09-16 14:04:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@
</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;'>+ is_os_cocoa = host_machine.system() == 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+ python_version = python3.language_version()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ python_version_req = '>= 3.5'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not python_version.version_compare(python_version_req)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glibmm-devel/files/patch-no_cocoa.diff b/devel/glibmm-devel/files/patch-no_cocoa.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6aeaace9c0e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glibmm-devel/files/patch-no_cocoa.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;'>---- configure.ac.orig 2017-09-04 06:26:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2017-09-05 01:57:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +62,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glibmm_have_cocoa=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING([for Mac OS X Cocoa support])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <Cocoa/Cocoa.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#error "Detected Mac OS X Cocoa support"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef GNUSTEP_BASE_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #error "Detected GNUstep, not Cocoa"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span></pre><pre style='margin:0'>
</pre>