<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/c1844fe178f4436716aecef597f22ac9a761cb2e">https://github.com/macports/macports-ports/commit/c1844fe178f4436716aecef597f22ac9a761cb2e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c1844fe178f4436716aecef597f22ac9a761cb2e
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Sep 11 12:41:24 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> libgit2-glib: take co-ownership; cleanup
</span>---
gnome/libgit2-glib/Portfile | 93 ++++++++++++++++++++++++++-------------------
1 file changed, 53 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgit2-glib/Portfile b/gnome/libgit2-glib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 748ef736dbf..290a62471c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libgit2-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgit2-glib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,22 +7,34 @@ PortGroup meson 1.0
</span> gitlab.instance https://gitlab.gnome.org
gitlab.setup GNOME libgit2-glib 1.1.0 v
revision 3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories gnome devel
</span> license LGPL-2+
<span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {devans @dbevans} {mascguy @mascguy} openmaintainer
</span> description Glib wrapper library around the libgit2 git access library.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {devans @dbevans} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories gnome devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://gitlab.gnome.org/GNOME/libgit2-glib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> checksums rmd160 95434b9bfaae9524018ad5607218648e4e705bc5 \
sha256 3e0d192a42644f522761fd40d7770b70b43df415d621bad1fe8c52dd66838989 \
size 133694
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patch meson.build to correctly find our configured python and its installation path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-find-mp-python3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@@PYTHON3_BIN@@|${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|^#!.*|#!${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson_python_compile.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson_vapi_link.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
path:lib/pkgconfig/libgit2.pc:libgit2 \
port:libssh2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,63 +42,66 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span>
compiler.c_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch meson.build to correctly find our configured python and its installation path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-meson-find-mp-python3.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PYTHON3_BIN@@|${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^#!.*|#!${configure.python}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/meson_python_compile.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/meson_vapi_link.py
</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;'>-configure.args -Dgtk_doc=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dgtk_doc=false \
</span> -Dpython=false \
-Dtranslate_windows_paths=false
platform darwin powerpc {
# vapigen is broken on PPC at the moment.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -Dvapi=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dvapi=false
</span> }
# Work around lack of @rpath on Tiger, i.e. this error:
# dyld: Library not loaded: @loader_path/libgit2-glib-1.0.0.dylib
platform darwin 8 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append "DYLD_LIBRARY_PATH=${build_dir}/${name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "DYLD_LIBRARY_PATH=${build_dir}/${name}"
</span> }
# uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_destroot_env(${arch}) "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CC=${configure.cc} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_destroot_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CC=${configure.cc} -arch ${arch}"
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CC=${configure.cc} ${configure.cc_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CC=${configure.cc} ${configure.cc_archflags}"
</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;'>+proc py_setup {py_ver} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix frameworks_dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/bin/python${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${frameworks_dir}/Python.framework/Versions/${py_ver}/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dpython=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-gobject3
</span> }
variant python38 conflicts python39 python310 description {Enable Python support using python38} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -Dpython=false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py38-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.8/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_setup 3.8
</span> }
variant python39 conflicts python38 python310 description {Enable Python support using python39} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -Dpython=false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py39-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.9/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_setup 3.9
</span> }
variant python310 conflicts python38 python39 description {Enable Python support using python310} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -Dpython=false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py310-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.10/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_setup 3.10
</span> }
if {![variant_isset python38] &&
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,5 +109,3 @@ if {![variant_isset python38] &&
</span> ![variant_isset python310]} {
default_variants +python310
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type gnome-with-unstable
</span></pre><pre style='margin:0'>
</pre>