<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/1828c7afa1b4a6e50b7072ac7adda483a4029652">https://github.com/macports/macports-ports/commit/1828c7afa1b4a6e50b7072ac7adda483a4029652</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1828c7afa1b4a6e50b7072ac7adda483a4029652
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Nov 1 17:11:36 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-pygtk: reconcile with py-pygtk-devel
</span><span style='display:block; white-space:pre;color:#404040;'> - Includes fix for implicit function declarations, etc
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/63585
</span>---
python/py-pygtk/Portfile | 9 +++++++--
.../files/patch-pango.override-private-interface.diff | 15 +++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pygtk/Portfile b/python/py-pygtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d57e35129a..bcd3b54ebcb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pygtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pygtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,9 @@ PortGroup active_variants 1.1
</span>
set my_name pygtk
name py-${my_name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts py-${my_name}-devel
</span> version 2.24.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> set branch [join [lrange [split ${version} .] 0 1] .]
python.versions 27
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +28,7 @@ long_description \
</span> homepage http://www.pygtk.org/
master_sites gnome:sources/${my_name}/${branch}/
distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir py-${my_name}
</span> use_bzip2 yes
checksums rmd160 33f597def646261483cbbf5491aeb27bf0d22ea6 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +41,8 @@ build.target all
</span> destroot.cmd make
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts py${python.version}-${my_name}-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +57,7 @@ if {${name} ne ${subport}} {
</span> patch-configure.ac-automake-config-headers.diff \
patch-configure.ac-gtk-quartz.diff \
patch-configure.ac-pyexecdir.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-pango.override-private-interface.diff \
</span> patch-pango-find_shaper.diff
compiler.c_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +72,7 @@ if {${name} ne ${subport}} {
</span> configure.pre_args-append --prefix=${python.prefix}
configure.cflags-append -I${python.prefix}/include \
-Wno-deprecated-declarations \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Wno-error=implicit-function-declaration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-int-conversion
</span> configure.ldflags-append -L${python.prefix}/lib
configure.pkg_config_path ${python.prefix}/lib/pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pygtk/files/patch-pango.override-private-interface.diff b/python/py-pygtk/files/patch-pango.override-private-interface.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9dbf0a56435
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pygtk/files/patch-pango.override-private-interface.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/pango.override b/pango.override
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index afe43ab..0bb5209 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pango.override
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pango.override
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,10 @@ headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pygobject.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pango/pango.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Fix problem with accessing private interface */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PANGO_AVAILABLE_IN_ALL PangoFontMetrics *pango_font_metrics_new (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PANGO_AVAILABLE_IN_ALL const char *pango_font_map_get_shape_engine_type (PangoFontMap *fontmap);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PyObject *func, *data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } PyGtkCustomNotify;
</span></pre><pre style='margin:0'>
</pre>