<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/5d67a0de3953850f70a12fe0736dbeb57def4fda">https://github.com/macports/macports-ports/commit/5d67a0de3953850f70a12fe0736dbeb57def4fda</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 5d67a0de395 pango: update to 1.52.2
</span>5d67a0de395 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5d67a0de3953850f70a12fe0736dbeb57def4fda
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Apr 20 13:14:51 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> pango: update to 1.52.2
</span>---
x11/pango/Portfile | 33 ++++++++++-----
x11/pango/files/patch-meson-examples-tests.diff | 53 +++++++++++++++++++++++++
2 files changed, 76 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pango/Portfile b/x11/pango/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5370096f6ef..fe062105da0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/pango/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pango/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,11 @@ name pango
</span> conflicts pango-devel
set my_name pango
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.50.14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.52.2
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b79186d4153b4e7cda7b4966a30b77fd72c89e56 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1d67f205bfc318c27a29cfdfb6828568df566795df0cb51d2189cde7f2d581e8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4273776
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3d24f18df1639172bde594761bf9afca2e86ca98 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1963588
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,10 +35,15 @@ long_description The goal of the Pango project is to provide an \
</span> # Disable unexpected download of subprojects
meson.wrap_mode nodownload
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Ensure build doesn't pull in any examples or tests, unless explicitly enabled.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# And while this is arguably an improvement, upstream may or may not accept.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Merge Request: https://gitlab.gnome.org/GNOME/pango/-/merge_requests/732
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-examples-tests.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
port:help2man \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig
</span>
depends_lib-append \
path:lib/pkgconfig/cairo.pc:cairo \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +54,7 @@ depends_lib-append \
</span> path:lib/pkgconfig/harfbuzz.pc:harfbuzz
configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-examples=false \
</span> -Dfontconfig=enabled \
-Dfreetype=enabled \
-Dintrospection=enabled \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,6 +140,15 @@ if {[variant_isset x11]} {
</span> require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tests description {Enable test support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dinstall-tests=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dinstall-tests=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.target test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
delete ${worksrcpath}/subprojects/glib ${worksrcpath}/subprojects/glib.wrap
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,12 +159,10 @@ pre-configure {
</span> post-destroot {
set docdir ${prefix}/share/doc/${my_name}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} CODING_STYLE.md COPYING NEWS README.md THANKS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CODING_STYLE.md COPYING NEWS README.md THANKS \
</span> ${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type gnome
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type gnome-with-unstable
</span> livecheck.name ${my_name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pango/files/patch-meson-examples-tests.diff b/x11/pango/files/patch-meson-examples-tests.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..35f83f00fbe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pango/files/patch-meson-examples-tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,53 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Proposed patch, which ensures that examples and tests are truly disabled [when desired].
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Add a new build option - 'build-examples' - which can be used to disable the former.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# (Note that there is already a formal option for tests.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Author: Christopher Nielsen @ MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: 2024-04-17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Merge Request: https://gitlab.gnome.org/GNOME/pango/-/merge_requests/732
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2024-04-15 16:35:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2024-04-15 16:42:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -542,10 +542,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir('pango')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir('utils')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-subdir('examples')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-subdir('tests')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir('tools')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if get_option('install-tests')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ subdir('tests')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if get_option('build-examples')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ subdir('examples')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if get_option('gtk_doc')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir('docs')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -570,6 +576,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ summary('Introspection', gir.found(), section: 'Build')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ summary('Documentation', get_option('gtk_doc'), section: 'Build')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ summary('Install tests', get_option('install-tests'), section: 'Build')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++summary('Build Examples', get_option('build-examples'), section: 'Build')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ summary('prefix', pango_prefix, section: 'Directories')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ summary('includedir', pango_includedir, section: 'Directories')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson_options.txt.orig 2024-04-15 16:40:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson_options.txt 2024-04-15 16:41:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +11,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description : 'Install tests',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type: 'boolean',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ value: false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option('build-examples',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ description : 'Build example test programs',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ type: 'boolean',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ value: false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option('fontconfig',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description : 'Build with FontConfig support. Passing \'auto\' or \'disabled\' disables fontconfig where it is optional, i.e. on Windows and macOS. Passing \'disabled\' on platforms where fontconfig is required results in error.',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type: 'feature',
</span></pre><pre style='margin:0'>
</pre>