<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/2184bf85084650d8b1219895f3b554a65e4420ad">https://github.com/macports/macports-ports/commit/2184bf85084650d8b1219895f3b554a65e4420ad</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 2184bf85084 pangox-compat: Fix build with current pango
</span>2184bf85084 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2184bf85084650d8b1219895f3b554a65e4420ad
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jul 20 23:24:09 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> pangox-compat: Fix build with current pango
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64228
</span>---
x11/pangox-compat/Portfile | 13 +++++++----
.../files/pango_x_font_class_init.patch | 17 ++++++++++++++
.../files/pango_x_font_find_shaper.patch | 26 ++++++++++++++++++++++
x11/pangox-compat/files/private-functions.patch | 23 +++++++++++++++++++
4 files changed, 75 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pangox-compat/Portfile b/x11/pangox-compat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d792c15233..644fb5ffc9b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/pangox-compat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pangox-compat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,13 @@ PortSystem 1.0
</span>
name pangox-compat
version 0.0.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4c1f8f0b23037bdba0eef9a905aa234a7dff78a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 267396
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {ryandesign @ryandesign} openmaintainer
license LGPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,14 +22,15 @@ homepage https://www.pango.org/
</span> master_sites gnome:sources/${name}/${branch}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4c1f8f0b23037bdba0eef9a905aa234a7dff78a4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build port:pkgconfig
depends_lib path:lib/pkgconfig/pango.pc:pango \
port:xorg-libX11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append pango_x_font_class_init.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pango_x_font_find_shaper.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private-functions.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --disable-silent-rules
test.run yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pangox-compat/files/pango_x_font_class_init.patch b/x11/pangox-compat/files/pango_x_font_class_init.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..73982584c25
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pangox-compat/files/pango_x_font_class_init.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pangox.c:282:15: error: no member named 'find_shaper' in 'struct _PangoFontClass'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/pango/-/issues/644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/Archive/pangox-compat/-/issues/1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://aur.archlinux.org/cgit/aur.git/tree/0002-disable-shaper.patch?h=pangox-compat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pangox.c.orig 2012-08-27 18:19:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pangox.c 2023-07-20 20:58:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -279,7 +279,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ font_class->describe = pango_x_font_describe;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ font_class->get_coverage = pango_x_font_get_coverage;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- font_class->find_shaper = pango_x_font_find_shaper;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ font_class->get_glyph_extents = pango_x_font_get_glyph_extents;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ font_class->get_metrics = pango_x_font_get_metrics;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ font_class->get_font_map = pango_x_font_get_font_map;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pangox-compat/files/pango_x_font_find_shaper.patch b/x11/pangox-compat/files/pango_x_font_find_shaper.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3811d0d998f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pangox-compat/files/pango_x_font_find_shaper.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix find_shaper for module-less pango. This patch is the second hunk of:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/Archive/pangox-compat/-/commit/edb9e0904d04d1da02bba7b78601a2aba05aaa47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The first hunk, which removed pango_x_get_shaper_map, is not included because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+that function is still used elsewhere in the code.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pangox.c.orig 2012-08-27 18:19:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pangox.c 2023-07-20 22:49:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1372,12 +1372,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PangoLanguage *language,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ guint32 ch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PangoMap *shape_map = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PangoScript script;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- shape_map = pango_x_get_shaper_map (language);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- script = pango_script_for_unichar (ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (PangoEngineShape *)pango_map_get_engine (shape_map, script);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static PangoEngineShape *shaper;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (g_once_init_enter (&shaper))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_once_init_leave (&shaper,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _pango_basic_x_script_engine_create("BasicScriptEngineXCompat"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return shaper;
</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;'>+ /* Utility functions */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pangox-compat/files/private-functions.patch b/x11/pangox-compat/files/private-functions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..59251f23f57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pangox-compat/files/private-functions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pangox.c:982:17: error: implicit declaration of function 'pango_font_metrics_new' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pangox-fontmap.c:944:21: error: implicit declaration of function 'pango_config_key_get' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/pango/-/issues/644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/Archive/pangox-compat/-/issues/1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268301
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.freebsd.org/bugzilla/attachment.cgi?id=238694
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pango-impl-utils.h.orig 2012-08-27 18:19:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pango-impl-utils.h 2023-07-20 22:44:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,6 +174,11 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* From pango-font-private.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PangoFontMetrics *pango_font_metrics_new (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* From pango-utils-private.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++char *pango_config_key_get (const char *key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_END_DECLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>