<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/9fb52ea966c687b3c6f015420fd067d088ee14c6">https://github.com/macports/macports-ports/commit/9fb52ea966c687b3c6f015420fd067d088ee14c6</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 9fb52ea966c graphviz: fix gvedit - Update to QT5 - Use workaround for short version string
</span>9fb52ea966c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9fb52ea966c687b3c6f015420fd067d088ee14c6
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Oct 3 19:46:15 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> graphviz: fix gvedit
</span><span style='display:block; white-space:pre;color:#404040;'> - Update to QT5
</span><span style='display:block; white-space:pre;color:#404040;'> - Use workaround for short version string
</span>---
graphics/graphviz-devel/Portfile | 41 ++++++++++++++++++++++------------------
1 file changed, 23 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz-devel/Portfile b/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9154f5b6c9a..3f20900bade 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -338,7 +338,7 @@ subport graphviz-gui${thisbranch} {
</span>
subport gvedit${thisbranch} {
PortGroup app 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span>
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -351,33 +351,38 @@ subport gvedit${thisbranch} {
</span>
depends_lib-append port:graphviz${thisbranch}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set short_version_string [get_short_version_string]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${short_version_string} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "cannot find ${app.name} short version string"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${app.name} short version string: ${short_version_string}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## the sed command in `get_short_version_string` is currently not working,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## so hard-coding the short_version_string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set short_version_string [get_short_version_string]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# if {${short_version_string} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# return -code error "cannot find ${app.name} short version string"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ui_debug "${app.name} short version string: ${short_version_string}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span>
patchfiles patch-cmd-gvedit-Makefile.in.diff
configure.args --disable-silent-rules \
--with-qt \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_cv_prog_AWK=/usr/bin/awk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_prog_AWK=/usr/bin/awk \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_cv_prog_QMAKE=${prefix}/libexec/qt5/bin/qmake
</span>
build.dir ${worksrcpath}/cmd/gvedit
app.name GVEdit
app.executable gvedit
app.icon ${build.dir}/images/icon.png
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from '${build.dir}/mainwindow.cpp' line 276, " version: 1.02\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app.short_version_string 1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- app.short_version_string [get_short_version_string]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proc get_short_version_string {} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global build.dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [exec /usr/bin/sed -E -n s/^\[\[:space:\]\]*"\[Vv\]ersion:\[\[:space:\]\]*(\[0-9.\]+).*/\\1/p ${build.dir}/mainwindow.cpp]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# pre-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# app.short_version_string [get_short_version_string]
</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;'>+# proc get_short_version_string {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# global build.dir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# return [exec /usr/bin/sed -E -n s/^\[\[:space:\]\]*"\[Vv\]ersion:\[\[:space:\]\]*(\[0-9.\]+).*/\\1/p ${build.dir}/mainwindow.cpp]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span> }
</pre><pre style='margin:0'>
</pre>