<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/b4dd4327707a675513e8d928b298be43b5845625">https://github.com/macports/macports-ports/commit/b4dd4327707a675513e8d928b298be43b5845625</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b4dd4327707a675513e8d928b298be43b5845625
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Dec 14 23:50:07 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> pango-devel: Update to 1.50.1
</span>---
x11/pango-devel/Portfile | 10 +-
x11/pango-devel/files/errno.patch | 11 +++
.../fix-pango_layout_get_pixel_extents-crash.patch | 105 ---------------------
x11/pango-devel/files/pango-tiger-no-coretext.diff | 48 ----------
4 files changed, 16 insertions(+), 158 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 7f128824435..784c7a0664b 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;'>@@ -11,11 +11,11 @@ name pango-devel
</span> conflicts pango
set my_name pango
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.48.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.50.1
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 042c2036057af817a6eecbc98a71b8495d68bd94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 21e1f5798bcdfda75eabc4280514b0896ab56f656d4e7e66030b9a2535ecdc98 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2071736
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e8e9e8629df9889b587f75ff3b9d9c8686483d5e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7760a03e9a652a7a10384a55a63c3196bfc645796a45d110131781d4814c81cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4067632
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ depends_lib \
</span> port:fribidi \
path:lib/pkgconfig/harfbuzz.pc:harfbuzz
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles pango-tiger-no-coretext.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles errno.patch
</span>
configure.args-append -Dxft=disabled \
-Dintrospection=enabled
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pango-devel/files/errno.patch b/x11/pango-devel/files/errno.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..636a82814dc
</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/errno.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/pango/-/issues/640
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pango/json/gtkjsonparser.c.orig 2021-12-10 17:38:12.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pango/json/gtkjsonparser.c 2021-12-14 23:45:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Authors: Benjamin Otte <otte@gnome.org>
</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;'>++#include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "config.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pango-devel/files/fix-pango_layout_get_pixel_extents-crash.patch b/x11/pango-devel/files/fix-pango_layout_get_pixel_extents-crash.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 11e0bf87a03..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/pango-devel/files/fix-pango_layout_get_pixel_extents-crash.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,105 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix a crash in pango_layout_get_pixel_extents
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/pango/issues/352
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/pango/commit/589af36865e5277f64b033d501741b6d365d01ce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pango/pangocoretext-fontmap.c.orig 2018-08-05 21:47:22.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pango/pangocoretext-fontmap.c 2020-01-18 23:07:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1524,6 +1524,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GPtrArray *fonts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GPtrArray *coverages;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ guint real_font_count;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct _PangoCoreTextFontsetClass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1554,10 +1555,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar **family_names;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const gchar *family;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GPtrArray *fonts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fonts = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fontset = g_object_new (PANGO_TYPE_CORE_TEXT_FONTSET, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- family = pango_font_description_get_family (description);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- family_names = g_strsplit (family ? family : "", ",", -1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1584,7 +1584,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (font)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_ptr_array_add (fonts, font);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_ptr_array_add (fontset->fonts, font);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (best_font == NULL) best_font = font;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1595,17 +1595,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!best_font)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_ptr_array_free (fonts, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_object_unref (fontset);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Create a font set with best font */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fontset = g_object_new (PANGO_TYPE_CORE_TEXT_FONTSET, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fontset->key = pango_core_text_fontset_key_copy (key);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fontset->orig_description = pango_font_description_copy (description);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fontset->fonts = fonts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fontset->coverages = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fontset->real_font_count = fontset->fonts->len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Add the cascade list for this language */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(MAC_OS_X_VERSION_10_8) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1639,9 +1637,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fontset->cascade_list = CTFontCopyDefaultCascadeList (pango_core_text_font_get_ctfont (best_font));
</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;'>-- /* length of cascade list + 1 for the "real" font at the front */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_ptr_array_set_size (fontset->fonts, CFArrayGetCount (fontset->cascade_list) + fonts->len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_ptr_array_set_size (fontset->coverages, CFArrayGetCount (fontset->cascade_list) + fonts->len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* length of cascade list + real_font_count for the "real" fonts at the front */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_ptr_array_set_size (fontset->fonts, CFArrayGetCount (fontset->cascade_list) + fontset->real_font_count);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_ptr_array_set_size (fontset->coverages, CFArrayGetCount (fontset->cascade_list) + fontset->real_font_count);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return fontset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1670,8 +1668,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pango_core_text_fontset_get_font_at (PangoCoreTextFontset *ctfontset,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* The first font is loaded as soon as the fontset is created */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (i == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* These fonts are loaded as soon as the fontset is created */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (i < ctfontset->real_font_count)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return g_ptr_array_index (ctfontset->fonts, i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (i >= ctfontset->fonts->len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1679,7 +1677,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (g_ptr_array_index (ctfontset->fonts, i) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CTFontDescriptorRef ctdescriptor = CFArrayGetValueAtIndex (ctfontset->cascade_list, i - 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CTFontDescriptorRef ctdescriptor = CFArrayGetValueAtIndex (ctfontset->cascade_list, i - ctfontset->real_font_count);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PangoFont *font = pango_core_text_fontset_load_font (ctfontset, ctdescriptor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_ptr_array_index (ctfontset->fonts, i) = font;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_ptr_array_index (ctfontset->coverages, i) = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1708,6 +1706,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ctfontset->cascade_list = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ctfontset->fonts = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ctfontset->coverages = g_ptr_array_new ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ctfontset->real_font_count = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1732,7 +1731,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_ptr_array_free (ctfontset->coverages, TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFRelease (ctfontset->cascade_list);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ctfontset->cascade_list)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CFRelease (ctfontset->cascade_list);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pango_font_description_free (ctfontset->orig_description);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9dfe490fd12..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/pango-devel/files/pango-tiger-no-coretext.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2021-09-07 18:23:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2021-09-07 18:30:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -370,7 +370,7 @@
</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 host_system == 'darwin'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- has_core_text = cc.links('''#include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ has_core_text = cc.links('''#include <CoreText/CoreText.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main (void) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CTGetCoreTextVersion ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -446,15 +446,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endforeach
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if dep.found()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if b[0] == 'cairo-ft'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if build_pangoft2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pango_conf.set(b[2], 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pango_font_backends += b[3]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pango_conf.set(b[2], 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pango_font_backends += b[3]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if b[0] == 'cairo-ft' and not build_pangoft2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if b[0] == 'cairo-quartz' and not pango_conf.has('HAVE_CORE_TEXT')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pango_conf.set(b[2], 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pango_font_backends += b[3]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endforeach
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -503,8 +502,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach header : cairo_headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if cc.has_header('cairo-@0@.h'.format(header))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pango_conf.set('HAVE_CAIRO_@0@'.format(header.underscorify().to_upper()), 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if header == 'win32' or header == 'quartz'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if header == 'win32'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pango_font_backends += header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif header == 'quartz'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if pango_conf.has('HAVE_CORE_TEXT')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pango_font_backends += header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pango_cairo_backends += header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span></pre><pre style='margin:0'>
</pre>