<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/f736227acabec785c233c010625da219686ae272">https://github.com/macports/macports-ports/commit/f736227acabec785c233c010625da219686ae272</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 f736227acab cairo-devel: add patch, for FONT_COLOR_GLYPHS
</span>f736227acab is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f736227acabec785c233c010625da219686ae272
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Oct 22 07:40:06 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    cairo-devel: add patch, for FONT_COLOR_GLYPHS
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/66852
</span>---
 graphics/cairo-devel/Portfile                      |  5 ++++-
 .../cairo-devel/files/patch-cairo-quartz-font.diff | 25 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo-devel/Portfile b/graphics/cairo-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3784b43c525..a6af52a28d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/cairo-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/cairo-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ name                        cairo-devel
</span> conflicts                   cairo
 set my_name                 cairo
 version                     1.18.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision                    0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision                    1
</span> checksums                   rmd160  5bdf361c9fbbfedc5cccd5a4e1fd2049c29aa59b \
                             sha256  243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 \
                             size    33761148
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +52,9 @@ patchfiles-append           patch-darwin-dylib-versions.diff
</span> # Upstream patch to add build option 'lzo2', so that we can explicitly disable
 patchfiles-append           patch-meson-add-option-lzo2.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream patch to fix FONT_COLOR_GLYPHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append           patch-cairo-quartz-font.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
     fs-traverse f ${worksrcpath} {
         if {[string match *.py ${f}]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/cairo-devel/files/patch-cairo-quartz-font.diff b/graphics/cairo-devel/files/patch-cairo-quartz-font.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3ec8910f36f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/cairo-devel/files/patch-cairo-quartz-font.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream patch to fix FONT_COLOR_GLYPHS, identified by our own Ryan Schmidt:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# FONT_COLOR_GLYPHS appears to be backwards. You're using kCTFontTraitColorGlyphs on less than
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 10.8 and kCTFontColorGlyphsTrait on 10.8 and later, yet it is kCTFontColorGlyphsTrait that is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# available in 10.7 and later and deprecated in newer systems and kCTFontTraitColorGlyphs which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# is available in 10.8 and later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Issue: https://gitlab.freedesktop.org/cairo/cairo/-/issues/810
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cairo-quartz-font.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cairo-quartz-font.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,10 +77,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FONT_ORIENTATION_HORIZONTAL kCTFontHorizontalOrientation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define FONT_COLOR_GLYPHS kCTFontTraitColorGlyphs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FONT_COLOR_GLYPHS kCTFontColorGlyphsTrait
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define FONT_ORIENTATION_HORIZONTAL kCTFontOrientationHorizontal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define FONT_COLOR_GLYPHS kCTFontColorGlyphsTrait
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FONT_COLOR_GLYPHS kCTFontTraitColorGlyphs
</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;'>+ static void
</span></pre><pre style='margin:0'>

</pre>