<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c4f74054a91e2a14de11d2e87d51498709ea4ddb">https://github.com/macports/macports-ports/commit/c4f74054a91e2a14de11d2e87d51498709ea4ddb</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 c4f74054a91 libgit2-glib: update to 0.99.0.1
</span>c4f74054a91 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c4f74054a91e2a14de11d2e87d51498709ea4ddb
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Thu Aug 20 01:41:55 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> libgit2-glib: update to 0.99.0.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * based on PR https://github.com/macports/macports-ports/pull/8161, thanks to @herbygillot
</span><span style='display:block; white-space:pre;color:#404040;'> * patch meson.build to correctly find our configured python and its installation path
</span><span style='display:block; white-space:pre;color:#404040;'> * use meson python module rather than deprecated module python3
</span><span style='display:block; white-space:pre;color:#404040;'> * avoids configuration errors on 10.14 and earlier and attempts to use system python3 on 10.15+
</span><span style='display:block; white-space:pre;color:#404040;'> * quiets python3 deprecation warning during configure
</span>---
gnome/libgit2-glib/Portfile | 18 +++++++++++-------
.../files/patch-meson-find-mp-python3.diff | 22 ++++++++++++++++++++++
.../files/patch-meson-find-python3.diff | 11 -----------
3 files changed, 33 insertions(+), 18 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 65799271d34..73dabed761e 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup meson 1.0
name libgit2-glib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.28.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.99.0.1
</span> revision 0
license LGPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1450e1eeeb039881e6bfb5318cec70eccbe90b02 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e70118481241a841d5261bdd4caa3158b2ffcb5ccf9d4f32b6cf6563b83a0f28 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 138928
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5bff8601649b3e53e2305b9f4125cf185196920f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e05a75c444d9c8d5991afc4a5a64cd97d731ce21aeb7c1c651ade1a3b465b9de \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 140996
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,14 +33,18 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:libssh2 \
port:vala
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-meson-find-python3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+# minor rework to use meson python() module rather than deprecated python3().
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoids configuration errors on 10.14 and earlier and attempts to use system python3 on 10.15+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# quiets python3 deprecation warning during configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-meson-find-mp-python3.diff
</span>
post-patch {
reinplace "s|@@PYTHON3_BIN@@|${configure.python}|" ${worksrcpath}/meson.build
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args -Dgtk_doc=true \
-Dpython=false
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgit2-glib/files/patch-meson-find-mp-python3.diff b/gnome/libgit2-glib/files/patch-meson-find-mp-python3.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dd09192f365
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgit2-glib/files/patch-meson-find-mp-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2020-02-26 02:23:03.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2020-08-21 19:48:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,7 +157,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enable_python = get_option('python')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if enable_python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- python = import('python3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ python = import('python').find_installation('@@PYTHON3_BIN@@')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ meson.add_install_script('meson_python_compile.py', libgit2_glib_libdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgit2-glib/meson.build.orig 2020-08-21 21:55:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgit2-glib/meson.build 2020-08-21 21:56:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -241,7 +241,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if enable_python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install_data(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'Ggit.py',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_dir: join_paths(python.sysconfig_path('purelib'), 'gi', 'overrides'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install_dir: join_paths(python.get_path('purelib'), 'gi', 'overrides'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgit2-glib/files/patch-meson-find-python3.diff b/gnome/libgit2-glib/files/patch-meson-find-python3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1fa3534f703..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libgit2-glib/files/patch-meson-find-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- meson.build.orig 2020-07-03 12:07:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ meson.build 2020-07-03 12:08:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -157,7 +157,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check for python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enable_python = get_option('python')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if enable_python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- python = import('python').find_installation('python3')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ python = import('python').find_installation('@@PYTHON3_BIN@@')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- python_req = '3.2.3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>