<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/797f2c9adabaed298fce0bb5197d4ca67613484e">https://github.com/macports/macports-ports/commit/797f2c9adabaed298fce0bb5197d4ca67613484e</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 797f2c9adab glade: update to version 3.38.2
</span>797f2c9adab is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 797f2c9adabaed298fce0bb5197d4ca67613484e
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Sep 13 20:45:28 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> glade: update to version 3.38.2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * now builds using meson
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies, configuration
</span><span style='display:block; white-space:pre;color:#404040;'> * apply upstream fix for man page generation issue
</span><span style='display:block; white-space:pre;color:#404040;'> * ensure that g-ir-scanner uses the right compiler
</span>---
devel/glade/Portfile | 64 ++++++++++++----------
.../allow-xsltproc-to-download-46b000c7.patch | 27 +++++++++
2 files changed, 62 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/Portfile b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8aac9f85754..735494aa8cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</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 gobject_introspection 1.0
</span> PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span>
name glade
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.36.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.38.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license LGPL-2+ GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description Glade is a RAD tool to enable quick & easy development of user interfaces \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,45 +20,51 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 577ca6641931a066fc9d5cdcc083fc78c221fabc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 19b546b527cc46213ccfc8022d49ec57e618fe2caa9aa51db2d2862233ea6f08 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4466808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 78381c71685f0ea17fecd975b356168737b7a315 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 98fc87647d88505c97dd2f30f2db2d3e9527515b3af11694787d62a8d28fbab7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2709224
</span>
depends_skip_archcheck devhelp
<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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span> port:itstool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:yelp-tools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxslt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk-doc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxslt
</span>
depends_lib path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \
<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:gobject-introspection \
</span> path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
port:libxml2
depends_run port:desktop-file-utils
<span style='display:block; white-space:pre;background:#ffe0e0;'>-gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles allow-xsltproc-to-download-46b000c7.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# disable optimization which (at least with clang)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# causes glade to segfault on startup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# after displaying main window
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# GJS Widget Support requires gjs >= 1.64.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.optflags -O0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Dgladeui=true \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgjs=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpython=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dwebkit2gtk=disabled
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-gladeui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-debug \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-webkit2gtk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-format-nonliteral
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![info exists universal_possible]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# uses g-ir-scanner, which uses $CC from env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
variant python38 conflicts python39 python310 description {Build Python 3.8 widgets support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dpython=disabled -Dpython=enabled
</span> configure.python ${prefix}/bin/python3.8
set python_framework ${frameworks_dir}/Python.framework/Versions/3.8
configure.env-append "PYTHON_LIBS=-L${python_framework}/lib -lpython3.8" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +74,7 @@ variant python38 conflicts python39 python310 description {Build Python 3.8 widg
</span> }
variant python39 conflicts python38 python310 description {Build Python 3.9 widgets support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dpython=disabled -Dpython=enabled
</span> configure.python ${prefix}/bin/python3.9
set python_framework ${frameworks_dir}/Python.framework/Versions/3.9
configure.env-append "PYTHON_LIBS=-L${python_framework}/lib -lpython3.9" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +84,7 @@ variant python39 conflicts python38 python310 description {Build Python 3.9 widg
</span> }
variant python310 conflicts python38 python39 description {Build Python 3.10 widgets support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-python --enable-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dpython=disabled -Dpython=enabled
</span> configure.python ${prefix}/bin/python3.10
set python_framework ${frameworks_dir}/Python.framework/Versions/3.10
configure.env-append "PYTHON_LIBS=-L${python_framework}/lib -lpython3.10" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +100,7 @@ if {![variant_isset python38] && \
</span> }
variant webkit2gtk description {Enable WebKit widgets catalog} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-webkit2gtk --enable-webkit2gtk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -Dwebkit2gtk=disabled -Dwebkit2gtk=enabled
</span> depends_lib-append path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
depends_run-append port:devhelp
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/files/allow-xsltproc-to-download-46b000c7.patch b/devel/glade/files/allow-xsltproc-to-download-46b000c7.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..90dadd0824f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glade/files/allow-xsltproc-to-download-46b000c7.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 46b000c70f8b5caefe77c7e4b9c3b7ef07044da1 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jonathan Paugh <jpaugh@pobox.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 11 Apr 2021 03:58:00 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Allow xsltproc to download files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+These files are required to build the man pages; unfortunately, xsltproc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+does not appear to cache these files, so this may not be the best
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+solution.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ man/meson.build | 1 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/man/meson.build b/man/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2345ea1f..f14b3e32 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- man/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ man/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,6 @@ assert(xsltproc.found(), 'xsltproc is required for man pages generation')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xsltproc_cmd = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xsltproc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '--output', '@OUTPUT@',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '--nonet',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '--stringparam', 'man.output.quietly', '1',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '--stringparam', 'funcsynopsis.style', 'ansi',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '--stringparam', 'man.th.extra1.suppress', '1',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>