<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/960b0388e02dca34ad2c61731ab45cf719c5d1cc">https://github.com/macports/macports-ports/commit/960b0388e02dca34ad2c61731ab45cf719c5d1cc</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 960b0388e02 dia: fix overlinking of icu
</span>960b0388e02 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 960b0388e02dca34ad2c61731ab45cf719c5d1cc
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Sat Jun 24 21:39:17 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> dia: fix overlinking of icu
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The build of the dia executable was erroneously including the icu
</span><span style='display:block; white-space:pre;color:#404040;'> libraries, even though they're not used directly. This caused
</span><span style='display:block; white-space:pre;color:#404040;'> breakage when icu was updated without rebuilding dia. The patchfile
</span><span style='display:block; white-space:pre;color:#404040;'> for configure.in now corrects this.
</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/67574
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built all variants successfully on 10.9 x86_64.
</span><span style='display:block; white-space:pre;color:#404040;'> Built default variants on 10.4-10.5 ppc, 10.5-10.6 i386, 10.5-10.15
</span><span style='display:block; white-space:pre;color:#404040;'> x86_64, and 11.x-13.x arm64. All successful except 10.4 i386 and 10.5
</span><span style='display:block; white-space:pre;color:#404040;'> x86_64 (due to broken glib2 build) and 10.5 i386 (due to broken
</span><span style='display:block; white-space:pre;color:#404040;'> clang-7.0).
</span>---
gnome/dia/Portfile | 2 +-
gnome/dia/files/patch-configure.in.diff | 21 +++++++++++++++------
2 files changed, 16 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/dia/Portfile b/gnome/dia/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 575330439c4..a4328cc1b08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/dia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/dia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup active_variants 1.1
</span>
name dia
version 0.97.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> checksums rmd160 a984efa1663cc154f4394060af37fab146f99175 \
sha256 22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34 \
size 5548500
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/dia/files/patch-configure.in.diff b/gnome/dia/files/patch-configure.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f5e96571b7f..5c5781c11d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/dia/files/patch-configure.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/dia/files/patch-configure.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.in.orig 2014-09-05 10:05:27.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.in 2022-05-19 04:16:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,14 +68,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.in.orig 2014-09-05 08:05:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.in 2023-06-19 20:59:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,14 +68,14 @@ if test "$have_pangoft2" = "true"; then
</span> dnl On Solaris with Forte C, at least, need to link app/dia with -lfreetype.
dnl It's not enough that -lpangoft2 implicitly pulls it in.
have_freetype=false
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> AC_TRY_CPP([#include <ft2build.h>
#include FT_FREETYPE_H
#if (FREETYPE_MAJOR*1000+FREETYPE_MINOR)*1000+FREETYPE_PATCH < 2000009
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,9 +83,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,9 +83,9 @@ if test "$have_pangoft2" = "true"; then
</span> #endif
],
[AC_MSG_RESULT(yes)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@
</span> AC_SUBST(FREETYPE_CFLAGS)
GTK_MODULES="$GTK_MODULES pangoft2"
AC_DEFINE(HAVE_FREETYPE,1,[Define if you have the FreeType2 library])]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -307,9 +307,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -307,9 +307,6 @@ dnl INTLOBJS doesn't seem to always get
</span> dnl idempotent
AC_SUBST(INTLOBJS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,16 @@
</span> dnl
dnl Locate the gnome-xml library
dnl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -540,8 +537,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -326,7 +323,7 @@ if test $found_libxml = false; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$vers" -ge 2003009; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT(found)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ found_libxml=true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- XML_LIBS="`$XML2_CONFIG --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ XML_LIBS="`$XML2_CONFIG --libs --dynamic`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XML_CFLAGS="`$XML2_CONFIG --cflags`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$enable_gnome_print" = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -540,8 +537,8 @@ if test "x$with_hardbooks" = "xno"; then
</span> AM_CONDITIONAL(WITH_PSDOC, test "xno" != "xno")
else
AM_CONDITIONAL(WITH_HTMLDOC, test "x$xsltproc" != "xno")
</pre><pre style='margin:0'>
</pre>