<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/8b8c9be1404f1b7df1527e0e74d23542909cd7f4">https://github.com/macports/macports-ports/commit/8b8c9be1404f1b7df1527e0e74d23542909cd7f4</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 8b8c9be1404 gitg: build fix for meson 0.61+
</span>8b8c9be1404 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8b8c9be1404f1b7df1527e0e74d23542909cd7f4
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Jul 27 17:59:35 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> gitg: build fix for meson 0.61+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * add gettext dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * update perl variants, default +python310
</span><span style='display:block; white-space:pre;color:#404040;'> * enable docs (manpage)
</span>---
gnome/gitg/Portfile | 43 +++++++++++++++++++---------------
gnome/gitg/files/patch-meson-0.61.diff | 36 ++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/Portfile b/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9f253bcfbab..ae2101a72e0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup meson 1.0
</span>
name gitg
version 3.32.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description GNOME git repository viewer.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,10 +32,11 @@ checksums rmd160 adf58770ac00c43a4bfc9df2d0ea69fd8a7b95cd \
</span> sha256 24a4aabf8a42aa2e783e1fb5996ebb3c2a82a01b9689269f1329517ef124ef5a \
size 10613836
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext
</span>
depends_lib port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2 \
path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
port:gsettings-desktop-schemas \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +56,8 @@ depends_run port:adwaita-icon-theme
</span>
# build GitgExt python extension for our configured python
# use meson python module rather than deprecated python3 module
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-libgitg-ext-meson-build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-libgitg-ext-meson-build.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-meson-0.61.diff
</span>
post-patch {
reinplace "s|@@PYTHON3_BIN@@|${configure.python}|" ${worksrcpath}/libgitg-ext/meson.build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,31 +66,34 @@ post-patch {
</span> # requires C11
compiler.c_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -Dpython=false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -Dpython=false \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddocs=true
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python37 python38 description {Enable Python support using python36} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python39 python310 description {Enable Python support using python38} {
</span> configure.args-delete -Dpython=false
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py36-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.6/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py38-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.8/lib/pkgconfig/
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python36 python38 description {Enable Python support using python37} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python38 python310 description {Enable Python support using python39} {
</span> configure.args-delete -Dpython=false
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py37-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.7/lib/pkgconfig/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py39-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.9/lib/pkgconfig/
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python36 python37 description {Enable Python support using python38} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python38 python39 description {Enable Python support using python310} {
</span> configure.args-delete -Dpython=false
<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;'>+ depends_lib-append port:py310-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.10/lib/pkgconfig/
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python36] && ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python38] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python39] && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python310]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python310
</span> }
variant quartz {}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/files/patch-meson-0.61.diff b/gnome/gitg/files/patch-meson-0.61.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bd938866c33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gitg/files/patch-meson-0.61.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 1978973b12848741b08695ec2020bac98584d636 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jan Beich <jbeich@FreeBSD.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 24 Jan 2022 12:17:52 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+data/meson.build:8:0: ERROR: Function does not take positional arguments.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+data/meson.build:44:0: ERROR: Function does not take positional arguments.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ data/meson.build | 2 --
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/data/meson.build b/data/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a8b90fd1..2413531d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- data/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ data/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,6 @@ desktop_config = configuration_data()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ desktop_config.set('icon', application_id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ desktop_config.set('binary', gitg_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- desktop,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type: 'desktop',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: configure_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: desktop + '.in.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +41,6 @@ appdata_config = configuration_data()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appdata_config.set('app-id', application_id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appdata_config.set('gettext', gitg_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- appdata,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type: 'xml',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: configure_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: appdata + '.in.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>