<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c5130040292a2b036568fed8e23822d5741b52c5">https://github.com/macports/macports-ports/commit/c5130040292a2b036568fed8e23822d5741b52c5</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 c5130040292 zathura: Fix build with meson 0.60 and later
</span>c5130040292 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c5130040292a2b036568fed8e23822d5741b52c5
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Mar 11 23:21:48 2025 -0500

<span style='display:block; white-space:pre;color:#404040;'>    zathura: Fix build with meson 0.60 and later
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/69273
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Also switch to path:-based dep for pkgconfig, use compiler.c_standard
</span><span style='display:block; white-space:pre;color:#404040;'>    instead of blacklisting manually, and use frameworks_dir instead of
</span><span style='display:block; white-space:pre;color:#404040;'>    assuming what its value is.
</span>---
 office/zathura/Portfile                |  9 +++++----
 office/zathura/files/meson.build.patch | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/zathura/Portfile b/office/zathura/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fb61f599c9a..89edcba02d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/office/zathura/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/zathura/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ checksums           rmd160  50dbda19ca101f680c3935befbde631217143a3b \
</span>                     size    194105
 
 depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:bin/pkg-config:pkgconfig \
</span>                     port:intltool
 
 depends_lib         port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,13 +41,14 @@ depends_lib         port:desktop-file-utils \
</span>                     port:libmagic \
                     path:lib/libgirara-gtk3.dylib:girara
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          meson.build.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # meson will automatically detect if synctex is available and link
 # against it. Explicitly disable it to avoid breaking zathura if
 # ever users uninstall texlive-bin
 configure.args-append   -Dsynctex=disabled
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# blacklist compilers that don't support -std=c11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist  *gcc-4.* {clang < 300}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +67,7 @@ subport ${name}-docs {
</span>     set python.dot_version "[string index ${python.version} 0].[string range ${python.version} 1 end]"
 
     post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|sphinx-build|${prefix}/Library/Frameworks/Python.framework/Versions/${python.dot_version}/bin/sphinx-build|g" ${worksrcpath}/doc/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|sphinx-build|${frameworks_dir}/Python.framework/Versions/${python.dot_version}/bin/sphinx-build|g" ${worksrcpath}/doc/meson.build
</span>     }
 
     depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/office/zathura/files/meson.build.patch b/office/zathura/files/meson.build.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7391594f0c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/office/zathura/files/meson.build.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with meson 0.60
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/pwmt/zathura/commit/c6ec5044c5ff843979050bfb81742d14740bb656
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This patch is included in 0.4.9 and should be removed when updating the port to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+that version or later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- data/meson.build.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ data/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,7 +19,7 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i18n = import('i18n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ podir = join_paths(meson.project_source_root(), 'po')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-desktop = i18n.merge_file('desktop',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++desktop = i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   input: 'org.pwmt.zathura.desktop.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   output: 'org.pwmt.zathura.desktop',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,7 @@ desktop = i18n.merge_file('desktop',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   type: 'desktop'
</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;'>+-appdata = i18n.merge_file('appdata',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++appdata = i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   input: 'org.pwmt.zathura.appdata.xml.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   output: 'org.pwmt.zathura.appdata.xml',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   install: true,
</span></pre><pre style='margin:0'>

</pre>