<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/35aee6ec0c166c06b220384bab5b0caca0266adb">https://github.com/macports/macports-ports/commit/35aee6ec0c166c06b220384bab5b0caca0266adb</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 35aee6ec0c1 harfbuzz-devel: fix assertmacros clash; fix test target; disable docs
</span>35aee6ec0c1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 35aee6ec0c166c06b220384bab5b0caca0266adb
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Dec 7 17:48:49 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> harfbuzz-devel: fix assertmacros clash; fix test target; disable docs
</span>---
graphics/harfbuzz-devel/Portfile | 25 ++++++++++++++++------
.../files/patch-meson-assert-macros.diff | 20 +++++++++++++++++
2 files changed, 38 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/harfbuzz-devel/Portfile b/graphics/harfbuzz-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 185feaea023..80d00f1abbb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/harfbuzz-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/harfbuzz-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,6 @@
</span> PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gobject_introspection 1.0
</span> PortGroup meson 1.0
# Please keep the harfbuzz and harfbuzz-devel ports as similar as possible.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +38,16 @@ depends_build-append \
</span>
configure.python ${prefix}/bin/python${py_ver}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Disable legacy non-underscore macros, defined by AssertMacros.h, on older macOS releases; fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ../harfbuzz-10.1.0/src/hb-buffer.hh:214:9: error: too many arguments provided to function-like macro invocation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 214 | hb_font_t *font,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# | ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# /usr/include/AssertMacros.h:1339:11: note: macro 'verify' defined here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 1339 | #define verify(assertion) __Verify(assertion)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# | ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-meson-assert-macros.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
fs-traverse f ${worksrcpath} {
if {[string match *.py ${f}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,8 +66,10 @@ compiler.cxx_standard \
</span> compiler.blacklist-append \
{clang < 700}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Options common across main and subport
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dchafa=disabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dchafa=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Ddocs=disabled
</span>
# Do not use -Werror. New compilers may have new warnings; we don't want users
# to encounter build failures because of that.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,6 +83,7 @@ if {${name} eq ${subport}} {
</span> path:lib/pkgconfig/cairo.pc:cairo \
port:freetype \
path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/gobject-introspection-1.0.pc:gobject-introspection \
</span> port:graphite2
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,12 +92,10 @@ if {${name} eq ${subport}} {
</span> -Dglib=enabled \
-Dgraphite2=enabled \
-Dgobject=enabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dicu=disabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gobject_introspection yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dicu=disabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dintrospection=enabled
</span>
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test.target check
</span>
post-destroot {
set docdir ${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,7 +145,8 @@ subport harfbuzz-icu-devel {
</span> -Dfreetype=disabled \
-Dglib=disabled \
-Dgraphite2=disabled \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -Dicu=enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dicu=enabled \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dintrospection=disabled
</span>
# Deconflict with parent port contents
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/harfbuzz-devel/files/patch-meson-assert-macros.diff b/graphics/harfbuzz-devel/files/patch-meson-assert-macros.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6b27fee290d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/harfbuzz-devel/files/patch-meson-assert-macros.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- meson.build.orig 2024-12-07 17:35:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ meson.build 2024-12-07 17:35:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -230,6 +230,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conf = configuration_data()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incconfig = include_directories('.')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Disable legacy non-underscore macros, defined by AssertMacros.h, on older macOS releases; fixes:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ../harfbuzz-10.1.0/src/hb-buffer.hh:214:9: error: too many arguments provided to function-like macro invocation
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# 214 | hb_font_t *font,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# | ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# /usr/include/AssertMacros.h:1339:11: note: macro 'verify' defined here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# 1339 | #define verify(assertion) __Verify(assertion)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# | ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if host_machine.system() == 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf.set('__ASSERTMACROS__', 1)
</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;'>+ add_project_arguments('-DHAVE_CONFIG_H', language: ['c', 'cpp'])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ warn_cflags = [
</span></pre><pre style='margin:0'>
</pre>