<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/10eff7c75c7f85338e3ecfdb86e597b2084d3fd7">https://github.com/macports/macports-ports/commit/10eff7c75c7f85338e3ecfdb86e597b2084d3fd7</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 10eff7c75c7 - pallet: fix build on newer systems
</span>10eff7c75c7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 10eff7c75c7f85338e3ecfdb86e597b2084d3fd7
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Sat Jan 2 23:23:09 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> - pallet: fix build on newer systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - allow viewing invisible dirs in preferences
</span><span style='display:block; white-space:pre;color:#404040;'> - update lib location in the Preferences directory selection box
</span><span style='display:block; white-space:pre;color:#404040;'> - bump revision
</span>---
sysutils/Pallet/Portfile | 32 ++++++++++++++++-
.../Pallet/files/patch-pallet-open-save-panel.diff | 21 ++++++++++++
.../Pallet/files/patch-pallet-system-target.diff | 40 ++++++++++++++++++++++
.../files/patch-preferences-lib-location.diff | 11 ++++++
4 files changed, 103 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/Pallet/Portfile b/sysutils/Pallet/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a6dc737186..9f0dcad611e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/Pallet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/Pallet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@ PortGroup xcode 1.0
</span>
name Pallet
version 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories sysutils aqua macports
license BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,6 +16,12 @@ homepage https://www.macports.org/
</span> #distname ${name}
#checksums md5 c586fd603d9978b306aee428ea39e329
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# svn fetch does not work on Catalina, at least, without MacPorts subversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# % /usr/bin/svn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# svn: error: Failed to locate 'svn'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# svn: error: The subversion command line tools are no longer provided by Xcode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_fetch-append port:subversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> fetch.type svn
svn.url https://svn.macports.org/repository/macports/contrib/Pallet
svn.revision 86930
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +31,21 @@ worksrcdir Pallet
</span> xcode.target Pallet
xcode.configuration Release
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.version} > 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-pallet-system-target.diff
</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-append patch-pallet-open-save-panel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-preferences-lib-location.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${prefix} ne "/op/local"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/PreferencesController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/opt/local|${prefix}|g" ${worksrcpath}/Preferences.xib
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin 8 {
pre-fetch {
ui_error "${name} requires Mac OS X 10.5 or greater."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +65,15 @@ if {[vercmp ${xcodeversion} 10.0] >= 0} {
</span> destroot.pre_args -UseNewBuildSystem=NO
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# the Growl framework should be removed, but until that is done, it has to be signed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# or the build will fail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # I'm not sure what system versions need to be signed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.version} > 14 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "/usr/bin/codesign --sign - Growl-1.2.1-Framework/Growl.framework"
</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;'>+
</span>
xcode.build.settings FRAMEWORK_SEARCH_PATHS='${frameworks_dir} Growl-1.2.1-Framework'
xcode.destroot.settings FRAMEWORK_SEARCH_PATHS='${frameworks_dir} Growl-1.2.1-Framework'
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/Pallet/files/patch-pallet-open-save-panel.diff b/sysutils/Pallet/files/patch-pallet-open-save-panel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a6bc4c70725
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/Pallet/files/patch-pallet-open-save-panel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git PreferencesController.m PreferencesController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1103e39..76a77a7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- PreferencesController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ PreferencesController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,7 @@ - (IBAction)selectPKGPath:(id)sender {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSOpenPanel *openPanel = [NSOpenPanel openPanel];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [openPanel setCanChooseFiles:NO];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [openPanel setCanChooseDirectories:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [openPanel setShowsHiddenFiles:YES];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSInteger result = [openPanel runModalForDirectory:[defaults objectForKey:@"NSNavLastCurrentDirectory"] file:nil types:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(result == NSOKButton) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +38,7 @@ - (IBAction)selectPKGPath:(id)sender {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ defaultButton:@"OK"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ alternateButton:nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otherButton:nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- informativeTextWithFormat:@"You have to use the directory where macports1.0 was installed by MacPorts.\n\nGenerally it should be /Library/Tcl"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ informativeTextWithFormat:@"You have to use the directory where macports1.0 was installed by MacPorts.\n\nGenerally it should be /opt/local/libexec/macports/lib"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [alert runModal];
</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;color:#808080;'>diff --git a/sysutils/Pallet/files/patch-pallet-system-target.diff b/sysutils/Pallet/files/patch-pallet-system-target.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1f95f0ac0f9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/Pallet/files/patch-pallet-system-target.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git English.lproj/MainMenu.xib English.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 36b624f..d084239 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- English.lproj/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ English.lproj/MainMenu.xib
</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.10">
</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">10F569</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.AppKitVersion">1038.29</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10072,11 +10072,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <integer value="1050" key="NS.object.0"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <integer value="1060" key="NS.object.0"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <integer value="1050" key="NS.object.0"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <integer value="1060" key="NS.object.0"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </object>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Preferences.xib Preferences.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 928e2bc..2c8b281 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Preferences.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Preferences.xib
</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.03">
</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">9J61</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.InterfaceBuilderVersion">677</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="IBDocument.AppKitVersion">949.46</string>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/Pallet/files/patch-preferences-lib-location.diff b/sysutils/Pallet/files/patch-preferences-lib-location.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0be8c3bf683
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/Pallet/files/patch-preferences-lib-location.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Preferences.xib.orig 2021-01-03 11:34:51.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Preferences.xib 2021-01-03 11:36:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,7 +148,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="NSTextFieldCell" key="NSCell" id="808105839">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <int key="NSCellFlags">67239424</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <int key="NSCellFlags2">1346502656</int>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string key="NSContents">This is usually /Library/Tcl. Since this demo version is tested with MacPorts 1.8 your current installation may not fully work but you can always install a non privileged installation of MacPorts 1.8.</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ <string key="NSContents">This is usually /opt/local/libexec/macports/lib.</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <object class="NSFont" key="NSSupport">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string key="NSName">LucidaGrande</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <double key="NSSize">1.100000e+01</double>
</span></pre><pre style='margin:0'>
</pre>