<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/c234fe89edc847df9ff692e4eead0df3c3a88be1">https://github.com/macports/macports-ports/commit/c234fe89edc847df9ff692e4eead0df3c3a88be1</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 c234fe89edc babl: reconcile with babl-devel, including latest patches Fixes: https://trac.macports.org/ticket/59658 Fixes: https://trac.macports.org/ticket/59659
</span>c234fe89edc is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c234fe89edc847df9ff692e4eead0df3c3a88be1
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Oct 25 15:14:02 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    babl: reconcile with babl-devel, including latest patches
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/59658
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/59659
</span>---
 graphics/babl/Portfile                                     | 13 +++++++++----
 .../patch-babl-allow-non-clang-compilers-on-darwin.diff    | 14 ++++++++++++++
 graphics/babl/files/patch-babl-linker-fix-darwin.diff      | 11 +++++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/babl/Portfile b/graphics/babl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a748b38abe6..bb2dd95f33b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/babl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/babl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup           meson 1.0
</span> 
 name                babl
 conflicts           babl-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set my_name         babl
</span> version             0.1.88
 license             LGPL-3+
 set branch          [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,8 +19,9 @@ description         Babl is a library for dynamically handling pixel formats and
</span> long_description    ${description}
 
 homepage            http://gegl.org/babl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites        gimp:${name}/${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites        gimp:${my_name}/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir         ${my_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname            ${my_name}-${version}
</span> use_xz              yes
 
 checksums           rmd160  848aca23f6a4200de1c8086fc1e3a07288534da3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +38,9 @@ depends_lib-append  port:lcms2 \
</span>                     port:gobject-introspection \
                     port:vala
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          patch-babl-linker-fix-darwin.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-babl-allow-non-clang-compilers-on-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # require C11 (typedef redefinition)
 # babl-icc.c:1031:25: error: redefinition of typedef 'UTF8' is invalid in C
 compiler.c_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,5 +84,5 @@ variant docs description {Generate optional docs} {
</span> }
 
 livecheck.type      regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url       http://download.gimp.org/pub/${name}/${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex     "${name}-(\\d+(?:\\.\\d+)+)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url       http://download.gimp.org/pub/${my_name}/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex     "${my_name}-(\\d+(?:\\.\\d+)+)"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/babl/files/patch-babl-allow-non-clang-compilers-on-darwin.diff b/graphics/babl/files/patch-babl-allow-non-clang-compilers-on-darwin.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..623d30277b3
</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/files/patch-babl-allow-non-clang-compilers-on-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,11 +108,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   host_os.startswith('windows'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform_osx = host_os.startswith('darwin')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if platform_osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  if cc.get_id() != 'clang'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    error('You should use Clang/Clang++ on OSX.')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  endif
</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;background:#e0ffe0;'>+ platform_android = host_os.contains('android')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/babl/files/patch-babl-linker-fix-darwin.diff b/graphics/babl/files/patch-babl-linker-fix-darwin.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ab9a8250c56
</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/files/patch-babl-linker-fix-darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- babl/meson.build.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ babl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   babl_link_args = [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     '-Wl,--version-script=' + version_script[0].full_path()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elif cc.get_id() == 'clang'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elif host_machine.system() == 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if cc.links('', 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       name: '-Wl,-exported_symbols_list', 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       args: ['-Wl,-exported_symbols_list', 
</span></pre><pre style='margin:0'>

</pre>