<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/8abf9ac23e28dddf4dbdc5d9cbfb3c84d4525224">https://github.com/macports/macports-ports/commit/8abf9ac23e28dddf4dbdc5d9cbfb3c84d4525224</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 8abf9ac23e2 gutenprint: Fix build with llvm 15
</span>8abf9ac23e2 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 8abf9ac23e28dddf4dbdc5d9cbfb3c84d4525224
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Tue Mar 12 15:10:20 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    gutenprint: Fix build with llvm 15
</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/69472
</span>---
 print/gutenprint/Portfile            | 15 +++++++++------
 print/gutenprint/files/llvm-15.patch | 15 +++++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/gutenprint/Portfile b/print/gutenprint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c970b7ecea..56634ef0004 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/gutenprint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/gutenprint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,18 +6,18 @@ PortGroup           compiler_blacklist_versions 1.0
</span> 
 name                gutenprint
 version             5.3.3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> license             GPL-2+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          print
 maintainers         {mascguy @mascguy} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://gimp-print.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms           darwin
</span> 
 description         Gutenprint print plugin for GIMP
 long_description    ${description}
 
 universal_variant   no
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://gimp-print.sourceforge.io
</span> master_sites        sourceforge:gimp-print \
                     https://ftp.osuosl.org/pub/blfs/conglomeration/gutenprint/
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,16 +27,18 @@ checksums           rmd160  3a1a9a66ad376294fbb10b547ff53481a81b0337 \
</span>                     sha256  7279ecbc8e67d1858c53cb24e423ea1be98e214872006b79e6e03650dd54a072 \
                     size    5050624
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build       port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build       path:bin/pkg-config:pkgconfig
</span> 
 depends_lib         path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
                     path:lib/pkgconfig/gimp-2.0.pc:gimp2
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-notes {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span>     * This port only installs the Gutenprint plugin for GIMP.
     * You can get the complete Gutenprint drivers and utilities - except the gimp plugin - from:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      http://gimp-print.sourceforge.net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      ${homepage}
</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;'>+patchfiles          llvm-15.patch
</span> 
 # blacklist old compilers that do not support gcc diagnostic pragmas in functions
 # addresses 10.6 and possibly earlier
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +50,7 @@ configure.perl      /usr/bin/perl
</span> 
 configure.args      --disable-escputil \
                     --disable-samples \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --disable-silent-rules \
</span>                     --disable-test \
                     --without-cups \
                     --without-readline \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/gutenprint/files/llvm-15.patch b/print/gutenprint/files/llvm-15.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e029269c508
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/gutenprint/files/llvm-15.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with LLVM 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://cgit.freebsd.org/ports/commit/?id=68c402ae8744294ecb65d34960dea1fd233b9411
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gimp2/print.c.orig 2023-03-05 16:39:18.726997000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gimp2/print.c      2023-03-05 16:39:46.126948000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -114,8 +114,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (gimp_thumbnail_data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     g_free(gimp_thumbnail_data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  gint x = gimp_image_width(image_ID);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  gint y = gimp_image_height(image_ID);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  gint x = gimp_image_width(p2gint(image_ID));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  gint y = gimp_image_height(p2gint(image_ID));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (*width > x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     *width = x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if (*height > y)
</span></pre><pre style='margin:0'>

</pre>