<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/d2a3b7065dab04bba1c0f1493e5a1dc95c486702">https://github.com/macports/macports-ports/commit/d2a3b7065dab04bba1c0f1493e5a1dc95c486702</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 d2a3b7065da babl-devel: update to 0.1.94 - Also disable use of Git, to update git-version.h
</span>d2a3b7065da is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d2a3b7065dab04bba1c0f1493e5a1dc95c486702
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Aug 22 10:00:14 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> babl-devel: update to 0.1.94
</span><span style='display:block; white-space:pre;color:#404040;'> - Also disable use of Git, to update git-version.h
</span>---
graphics/babl-devel/Portfile | 14 ++++----
...atch-meson.build-disable-git-version-check.diff | 40 ++++++++++++++++++++++
2 files changed, 48 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/babl-devel/Portfile b/graphics/babl-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a82306d747..7c61d5a2b51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/babl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/babl-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup meson 1.0
</span> name babl-devel
conflicts babl
set my_name babl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.1.92
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.1.94
</span> revision 0
license LGPL-3+
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ dist_subdir ${my_name}
</span> distname ${my_name}-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 60c70e0581a91761a72716d1e68fd1eedb4c40dd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f667735028944b6375ad18f160a64ceb93f5c7dccaa9d8751de359777488a2c1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 309784
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e585f67ece64248f538e0c15a769c8b3d4d78cef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b6a8b28f55e0c17f5031fb7959e72ffe0fbf8196d1968ad6efc98d1b492c3bbe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 312128
</span>
configure.args-append \
-Dwith-docs=false
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,8 +39,10 @@ depends_lib-append port:lcms2 \
</span> path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
path:bin/vala:vala
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-babl-linker-fix-darwin.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-babl-allow-non-clang-compilers-on-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-babl-linker-fix-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-babl-allow-non-clang-compilers-on-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable use of Git to update git-version.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson.build-disable-git-version-check.diff
</span>
# require C11 (typedef redefinition)
# babl-icc.c:1031:25: error: redefinition of typedef 'UTF8' is invalid in C
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/babl-devel/files/patch-meson.build-disable-git-version-check.diff b/graphics/babl-devel/files/patch-meson.build-disable-git-version-check.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..563e52800fb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/babl-devel/files/patch-meson.build-disable-git-version-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2022-08-21 09:29:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2022-08-22 09:54:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -443,36 +438,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configuration: conf
</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;'>+-# If git is available, always check if git-version.h should be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# updated. If git is not available, don't do anything if git-version.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# already exists because then we are probably working with a tarball
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# in which case the git-version.h we ship is correct.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if git_bin.found() and run_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- git_bin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'rev-parse',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '--is-inside-work-tree',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- check: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-).returncode() == 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- git_version_h = vcs_tag(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- input : 'git-version.h.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- output: 'git-version.h',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- replace_string: '@BABL_GIT_VERSION@',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- command: [ git_bin.path(), 'describe', '--always' ],
</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;'>+- if not meson.is_subproject()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- meson.add_dist_script(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ 'ninja', 'git-version.h', ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- meson.add_dist_script(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ 'sh', '-c', ' '.join(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ 'cp', git_version_h.full_path(), '${MESON_DIST_ROOT}' ]
</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;'>+- endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- git_version_h = files('git-version.h')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++git_version_h = files('git-version.h')
</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;'>+ # Global variables
</span></pre><pre style='margin:0'>
</pre>