<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/831c4ec1776a0daa5a89d9933818d12500b3ad58">https://github.com/macports/macports-ports/commit/831c4ec1776a0daa5a89d9933818d12500b3ad58</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 831c4ec1776 pango-devel: Fix Tiger build
</span>831c4ec1776 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 831c4ec1776a0daa5a89d9933818d12500b3ad58
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Tue Sep 7 20:57:19 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> pango-devel: Fix Tiger build
</span>---
x11/pango-devel/Portfile | 17 ++++----
x11/pango-devel/files/pango-tiger-no-coretext.diff | 48 ++++++++++++++++++++++
2 files changed, 58 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pango-devel/Portfile b/x11/pango-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a9d42114234..a079962d0cb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/pango-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pango-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +48,8 @@ depends_lib \
</span> port:fribidi \
port:harfbuzz-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles pango-tiger-no-coretext.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append -Dxft=disabled \
-Dintrospection=enabled
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,12 +62,13 @@ configure.cxxflags-append \
</span>
license_noconflict gobject-introspection
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform macosx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.subplatform} eq "macosx" && ${os.major} > 8} {
</span> variant quartz {
# Although this variant does nothing, pango will automatically build
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # itself differently depending on whether or not cairo is installed with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the quartz variant. Therefore this variant is necessary to be able to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # distinguish whether an installed pango has Quartz support or not.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # itself differently depending on whether or not cairo is installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # with the quartz variant and whether CoreText is available. Therefore
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this variant is necessary to be able to distinguish whether an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # installed pango has Quartz support or not.
</span> }
default_variants +quartz
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,9 +87,9 @@ variant x11 {
</span> }
default_variants +x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # When not on macOS, don't allow X11 support to be disabled, since it is the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # only available option.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} ne "darwin" || ${os.subplatform} ne "macosx" || ${os.major} <= 8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # When not on macOS 10.5+, don't allow X11 support to be disabled, since it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is the only available option.
</span> variant_set x11
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pango-devel/files/pango-tiger-no-coretext.diff b/x11/pango-devel/files/pango-tiger-no-coretext.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9dfe490fd12
</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-devel/files/pango-tiger-no-coretext.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2021-09-07 18:23:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2021-09-07 18:30:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -370,7 +370,7 @@
</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 host_system == 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- has_core_text = cc.links('''#include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ has_core_text = cc.links('''#include <CoreText/CoreText.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main (void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CTGetCoreTextVersion ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -446,15 +446,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if dep.found()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if b[0] == 'cairo-ft'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if build_pangoft2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pango_conf.set(b[2], 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pango_font_backends += b[3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pango_conf.set(b[2], 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pango_font_backends += b[3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if b[0] == 'cairo-ft' and not build_pangoft2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if b[0] == 'cairo-quartz' and not pango_conf.has('HAVE_CORE_TEXT')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pango_conf.set(b[2], 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pango_font_backends += b[3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -503,8 +502,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach header : cairo_headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if cc.has_header('cairo-@0@.h'.format(header))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_conf.set('HAVE_CAIRO_@0@'.format(header.underscorify().to_upper()), 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if header == 'win32' or header == 'quartz'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if header == 'win32'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_font_backends += header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elif header == 'quartz'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if pango_conf.has('HAVE_CORE_TEXT')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pango_font_backends += header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_cairo_backends += header
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span></pre><pre style='margin:0'>
</pre>