<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/3beb9ee18999473766fbe77378105e44e6a919b9">https://github.com/macports/macports-ports/commit/3beb9ee18999473766fbe77378105e44e6a919b9</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 3beb9ee1899 graphviz-devel: Fix Xcode 10+ build issue
</span>3beb9ee1899 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3beb9ee18999473766fbe77378105e44e6a919b9
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Aug 21 21:32:15 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> graphviz-devel: Fix Xcode 10+ build issue
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use the old build system on Xcode 10 and later and add a patch to up the
</span><span style='display:block; white-space:pre;color:#404040;'> deployment target from 10.5 to 10.6, as had been done previously for the
</span><span style='display:block; white-space:pre;color:#404040;'> graphviz port.
</span>---
graphics/graphviz-devel/Portfile | 9 ++++
.../graphviz-devel/files/patch-xib-target.diff | 48 ++++++++++++++++++++++
graphics/graphviz/Portfile | 10 ++---
3 files changed, 62 insertions(+), 5 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 6c6f13a21fe..4a43d8ffce4 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;'>@@ -319,6 +319,15 @@ subport graphviz-gui${thisbranch} {
</span>
patchfiles patch-project.pbxproj.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${xcodeversion} 10.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 10+ will not build against an IBDocument.SystemTarget of 10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-xib-target.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This port does not build with the new Xcode build system at present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.pre_args -UseNewBuildSystem=NO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.pre_args -UseNewBuildSystem=NO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> xcode.configuration Release
build.dir ${worksrcpath}/macosx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz-devel/files/patch-xib-target.diff b/graphics/graphviz-devel/files/patch-xib-target.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..30c36eb8032
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz-devel/files/patch-xib-target.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,48 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur macosx.orig/English.lproj/Attributes.xib macosx/English.lproj/Attributes.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macosx.orig/English.lproj/Attributes.xib 2016-08-09 23:02:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macosx/English.lproj/Attributes.xib 2019-02-18 13:44:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.01">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <data>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <int key="IBDocument.SystemTarget">1050</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <int key="IBDocument.SystemTarget">1060</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.SystemVersion">9B18</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.InterfaceBuilderVersion">629</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.AppKitVersion">949</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur macosx.orig/English.lproj/Document.xib macosx/English.lproj/Document.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macosx.orig/English.lproj/Document.xib 2016-08-09 23:02:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macosx/English.lproj/Document.xib 2019-02-18 13:44:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.01">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <data>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <int key="IBDocument.SystemTarget">1050</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <int key="IBDocument.SystemTarget">1060</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.SystemVersion">9C7010</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.InterfaceBuilderVersion">629</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.AppKitVersion">949.26</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur macosx.orig/English.lproj/Export.xib macosx/English.lproj/Export.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macosx.orig/English.lproj/Export.xib 2016-08-09 23:02:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macosx/English.lproj/Export.xib 2019-02-18 13:44:38.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.01">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <data>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <int key="IBDocument.SystemTarget">1050</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <int key="IBDocument.SystemTarget">1060</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.SystemVersion">9C7010</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.InterfaceBuilderVersion">629</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.AppKitVersion">949.26</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur macosx.orig/English.lproj/MainMenu.xib macosx/English.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- macosx.orig/English.lproj/MainMenu.xib 2016-08-09 23:02:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macosx/English.lproj/MainMenu.xib 2019-02-18 13:44:30.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.01">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <data>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <int key="IBDocument.SystemTarget">1050</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <int key="IBDocument.SystemTarget">1060</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.SystemVersion">9E17</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.InterfaceBuilderVersion">629</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.AppKitVersion">949.33</string>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/Portfile b/graphics/graphviz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf7be279055..b42c5c25773 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -319,13 +319,13 @@ subport graphviz-gui${thisbranch} {
</span>
patchfiles patch-project.pbxproj.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # this port does not build with the new xcode build system at present
</span> if {[vercmp ${xcodeversion} 10.0] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode10 will not build against an IBDocument.SystemTarget of 10.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-xib-target.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 10+ will not build against an IBDocument.SystemTarget of 10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-xib-target.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.pre_args -UseNewBuildSystem=NO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.pre_args -UseNewBuildSystem=NO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This port does not build with the new Xcode build system at present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.pre_args -UseNewBuildSystem=NO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.pre_args -UseNewBuildSystem=NO
</span> }
xcode.configuration Release
</pre><pre style='margin:0'>
</pre>