<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/27232840c3a17c40c3b3237b0b1113ddd2d8b250">https://github.com/macports/macports-ports/commit/27232840c3a17c40c3b3237b0b1113ddd2d8b250</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 27232840c3a17c40c3b3237b0b1113ddd2d8b250
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Apr 17 11:06:14 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> gobject-introspection{,-devel}: revert to 1.78.1
</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/69748
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/69105
</span>---
gnome/gobject-introspection-devel/Portfile | 17 ++++++++++-------
gnome/gobject-introspection/Portfile | 17 ++++++++++-------
2 files changed, 20 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection-devel/Portfile b/gnome/gobject-introspection-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e8954af288..f708ab9bb89 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gobject-introspection-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gobject-introspection-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,9 @@ name gobject-introspection-devel
</span> conflicts gobject-introspection
set my_name gobject-introspection
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.80.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.78.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span>
categories gnome
# library under LGPL-2+, tools under GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +28,9 @@ dist_subdir ${my_name}
</span> distname ${my_name}-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ad1d8efcf5c118efb6061d2ffc1eadfa55c6a555 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1040228
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3fda7e7ac0eb288335a4db69551fdf356fcc03b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd7babd99af7258e76819e45ba4a6bc399608fe762d83fde3cac033c50841bb4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1060296
</span>
# Disable unexpected download of subprojects
meson.wrap_mode nodownload
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,17 +49,19 @@ depends_lib-append \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:libffi \
port:py${py_ver_nodot}-mako \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${py_ver_nodot}-markdown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-markdown \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-setuptools
</span>
patchfiles-append patch-fix-rpath-gir-typelib.diff
patchfiles-append patch-fix-scanner-in-build-execution.diff
patchfiles-append patch-fix-tools-python.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|libcairo-gobject.2.dylib|${prefix}/lib/libcairo-gobject.2.dylib|g" ${worksrcpath}/gir/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|libcairo-gobject\\.2\\.dylib|${prefix}/lib/libcairo-gobject.2.dylib|g" ${worksrcpath}/gir/meson.build
</span> reinplace "s|@MP_LIB@|${prefix}/lib/|g" ${worksrcpath}/giscanner/shlibs.py
reinplace "s|@MP_PYTHON_CMD@|${configure.python}|g" ${worksrcpath}/tools/meson.build
reinplace "s|#!/usr/bin/env python3|#!${configure.python}|g" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/misc/update-glib-annotations.py \
</span> misc/update-gtkdoc-tests.py \
misc/update-vulkan-gir.py \
tests/gi-tester
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gobject-introspection/Portfile b/gnome/gobject-introspection/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6860159fffe..2b6d3c527bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gobject-introspection/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gobject-introspection/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,9 @@ name gobject-introspection
</span> conflicts gobject-introspection-devel
set my_name gobject-introspection
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.80.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.78.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span>
categories gnome
# library under LGPL-2+, tools under GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +28,9 @@ dist_subdir ${my_name}
</span> distname ${my_name}-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ad1d8efcf5c118efb6061d2ffc1eadfa55c6a555 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a1df7c424e15bda1ab639c00e9051b9adf5cea1a9e512f8a603b53cd199bc6d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1040228
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3fda7e7ac0eb288335a4db69551fdf356fcc03b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bd7babd99af7258e76819e45ba4a6bc399608fe762d83fde3cac033c50841bb4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1060296
</span>
# Disable unexpected download of subprojects
meson.wrap_mode nodownload
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,17 +49,19 @@ depends_lib-append \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
port:libffi \
port:py${py_ver_nodot}-mako \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${py_ver_nodot}-markdown
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-markdown \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-setuptools
</span>
patchfiles-append patch-fix-rpath-gir-typelib.diff
patchfiles-append patch-fix-scanner-in-build-execution.diff
patchfiles-append patch-fix-tools-python.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|libcairo-gobject.2.dylib|${prefix}/lib/libcairo-gobject.2.dylib|g" ${worksrcpath}/gir/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|libcairo-gobject\\.2\\.dylib|${prefix}/lib/libcairo-gobject.2.dylib|g" ${worksrcpath}/gir/meson.build
</span> reinplace "s|@MP_LIB@|${prefix}/lib/|g" ${worksrcpath}/giscanner/shlibs.py
reinplace "s|@MP_PYTHON_CMD@|${configure.python}|g" ${worksrcpath}/tools/meson.build
reinplace "s|#!/usr/bin/env python3|#!${configure.python}|g" \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/misc/update-glib-annotations.py \
</span> misc/update-gtkdoc-tests.py \
misc/update-vulkan-gir.py \
tests/gi-tester
</pre><pre style='margin:0'>
</pre>