<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/0160e2d031995b70171696a99bf885c002134756">https://github.com/macports/macports-ports/commit/0160e2d031995b70171696a99bf885c002134756</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 0160e2d0319 pango: reconcile with pango-devel; update to 1.55.0 (#26820)
</span>0160e2d0319 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0160e2d031995b70171696a99bf885c002134756
</span>Author: Lukas Oberhuber <lukas@hiphops.io>
AuthorDate: Fri Nov 29 16:39:53 2024 +0000
<span style='display:block; white-space:pre;color:#404040;'> pango: reconcile with pango-devel; update to 1.55.0 (#26820)
</span>---
x11/pango/Portfile | 20 ++++------
x11/pango/files/patch-meson-examples-tests.diff | 53 -------------------------
2 files changed, 8 insertions(+), 65 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 8cfa0e63fd6..c59dfee061b 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.52.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.55.0
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3d24f18df1639172bde594761bf9afca2e86ca98 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d0076afe01082814b853deec99f9349ece5f2ce83908b8e58ff736b41f78a96b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1963588
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e1a860f279fb352f41b95c7987e4cab678906945 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a2c17a8dc459a7267b8b167bb149d23ff473b6ff9d5972bee047807ee2220ccf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2098352
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,11 +35,6 @@ 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:#ffe0e0;'>-# Ensure build doesn't pull in any examples or tests, unless explicitly enabled.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# And while this is arguably an improvement, upstream may or may not accept.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Merge Request: https://gitlab.gnome.org/GNOME/pango/-/merge_requests/732
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-meson-examples-tests.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
port:help2man \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,16 +50,17 @@ depends_lib-append \
</span>
configure.args-append \
-Dbuild-examples=false \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-testsuite=false \
</span> -Dfontconfig=enabled \
-Dfreetype=enabled \
-Dintrospection=enabled \
-Dlibthai=disabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dinstall-tests=false \
</span> -Dxft=disabled
if { [string match *clang* ${configure.compiler}] } {
configure.cflags-append \
-Wno-error,-Wimplicit-fallthrough \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-error,-Wmissing-declarations \
</span> -Wno-error=unknown-warning-option \
-Wno-unknown-warning-option
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -142,8 +138,8 @@ if {[variant_isset x11]} {
</span>
variant tests description {Enable test support} {
configure.args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dinstall-tests=false \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dinstall-tests=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-testsuite=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dbuild-testsuite=true
</span>
test.run yes
test.target test
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 35f83f00fbe..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/pango/files/patch-meson-examples-tests.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Proposed patch, which ensures that examples and tests are truly disabled [when desired].
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Add a new build option - 'build-examples' - which can be used to disable the former.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (Note that there is already a formal option for tests.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Author: Christopher Nielsen @ MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date: 2024-04-17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Merge Request: https://gitlab.gnome.org/GNOME/pango/-/merge_requests/732
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2024-04-15 16:35:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2024-04-15 16:42:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -542,10 +542,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir('pango')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir('utils')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--subdir('examples')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--subdir('tests')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir('tools')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if get_option('install-tests')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ subdir('tests')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if get_option('build-examples')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ subdir('examples')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if get_option('gtk_doc')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subdir('docs')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -570,6 +576,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- summary('Introspection', gir.found(), section: 'Build')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- summary('Documentation', get_option('gtk_doc'), section: 'Build')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- summary('Install tests', get_option('install-tests'), section: 'Build')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+summary('Build Examples', get_option('build-examples'), section: 'Build')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- summary('prefix', pango_prefix, section: 'Directories')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- summary('includedir', pango_includedir, section: 'Directories')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson_options.txt.orig 2024-04-15 16:40:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson_options.txt 2024-04-15 16:41:31.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,6 +11,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- description : 'Install tests',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- type: 'boolean',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- value: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+option('build-examples',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ description : 'Build example test programs',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ type: 'boolean',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ value: false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option('fontconfig',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- type: 'feature',
</span></pre><pre style='margin:0'>
</pre>