<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f039d3a0fffb062a113a4b8d3dbcf60892503373">https://github.com/macports/macports-ports/commit/f039d3a0fffb062a113a4b8d3dbcf60892503373</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f039d3a0fffb062a113a4b8d3dbcf60892503373
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jun 20 21:37:40 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    pangoxsl: Fix build with pango 1.50 and later
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Now uses pango's pango_attr_line_height_new when available instead of
</span><span style='display:block; white-space:pre;color:#404040;'>    the one in pangoxsl, therefore revbump to rebuild.
</span>---
 textproc/pangoxsl/Portfile               |  5 +--
 textproc/pangoxsl/files/pango-1.50.patch | 55 ++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/pangoxsl/Portfile b/textproc/pangoxsl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a45ca480b6..45762fbd121 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/pangoxsl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/pangoxsl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> 
 name                pangoxsl
 version             1.6.0.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          textproc
 license             LGPL
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,8 @@ depends_build       port:pkgconfig
</span> 
 depends_lib         path:lib/pkgconfig/pango.pc:pango
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    pango-1.50.patch
</span> 
 platform darwin arm {
     depends_build-append    port:automake
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/pangoxsl/files/pango-1.50.patch b/textproc/pangoxsl/files/pango-1.50.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a270db2581d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/pangoxsl/files/pango-1.50.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with pango 1.50 and later:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In file included from pango-xsl-attributes.c:25:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+./pango-xsl-attributes.h:116:18: error: conflicting types for 'pango_attr_line_height_new'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PangoAttribute * pango_attr_line_height_new (gint line_height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/local/include/pango-1.0/pango/pango-attributes.h:607:25: note: previous declaration is here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PangoAttribute *        pango_attr_line_height_new              (double                       factor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pango-xsl-attributes.c:620:1: error: conflicting types for 'pango_attr_line_height_new'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pango_attr_line_height_new (gint line_height)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/usr/local/include/pango-1.0/pango/pango-attributes.h:607:25: note: previous declaration is here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PangoAttribute *        pango_attr_line_height_new              (double                       factor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://cgit.freebsd.org/ports/commit/?id=20c0152349bce047bb3198451234946f849f3d6b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pangoxsl/pango-xsl-attributes.h.orig   2004-10-10 23:44:39 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pangoxsl/pango-xsl-attributes.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define __PANGO_XSL_ATTRIBUTES_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pango/pango-attributes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <pango/pango-utils.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_BEGIN_DECLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,7 +114,9 @@ PangoAttrType    pango_attr_keep_with_previous_within_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PangoAttribute * pango_attr_keep_with_previous_within_line_new (gint strength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PangoAttrType    pango_attr_line_height_get_type (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !PANGO_VERSION_CHECK(1,50,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PangoAttribute * pango_attr_line_height_new (gint line_height);
</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;'>+ PangoAttrType    pango_attr_line_stacking_strategy_get_type (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PangoAttribute * pango_attr_line_stacking_strategy_new (PangoLineStackingStrategy line_stacking_strategy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pangoxsl/pango-xsl-attributes.c.orig   2004-10-10 23:44:39 UTC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pangoxsl/pango-xsl-attributes.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -616,6 +616,7 @@ pango_attr_line_height_get_type (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  * 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  * Return value: the new #PangoAttribute.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  **/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !PANGO_VERSION_CHECK(1,50,0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PangoAttribute *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_attr_line_height_new (gint line_height)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -631,6 +632,7 @@ pango_attr_line_height_new (gint line_height)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   return pango_attr_int_new (&klass, line_height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  * pango_attr_line_stacking_strategy_get_type:
</span></pre><pre style='margin:0'>

</pre>