<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[127739] trunk/dports/aqua/Quicksilver</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/127739">127739</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-11-02 09:50:39 -0800 (Sun, 02 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Quicksilver: update to 1.2.0</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquaQuicksilverPortfile">trunk/dports/aqua/Quicksilver/Portfile</a></li>
<li><a href="#trunkdportsaquaQuicksilverfilespatchQuicksilverQuicksilverxcodeprojprojectpbxprojdiff">trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquaQuicksilverfilespatchQuicksilverCodeQuickStepCoreQSCatalogEntrymdiff">trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Code-QuickStepCore-QSCatalogEntry.m.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquaQuicksilverPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/Quicksilver/Portfile (127738 => 127739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/Quicksilver/Portfile 2014-11-02 17:28:52 UTC (rev 127738)
+++ trunk/dports/aqua/Quicksilver/Portfile 2014-11-02 17:50:39 UTC (rev 127739)
</span><span class="lines">@@ -7,11 +7,8 @@
</span><span class="cx"> PortGroup xcode 1.0
</span><span class="cx"> PortGroup xcodeversion 1.0
</span><span class="cx">
</span><del>-# The developer states it is not possible to provide tags for 1.1.x > 1.1.0.
-# https://github.com/quicksilver/Quicksilver/issues/1644
-github.setup quicksilver Quicksilver caba0d11652ae651ce155457520ea87ad165c8f8
-version 1.1.3
-revision 1
</del><ins>+github.setup quicksilver Quicksilver 1.2.0-final v
+version 1.2.0
</ins><span class="cx"> platforms darwin
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="cx"> categories aqua sysutils
</span><span class="lines">@@ -43,7 +40,8 @@
</span><span class="cx"> file mkdir ${workpath}${config_root}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-patchfiles patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff
</del><ins>+patchfiles-append patch-Quicksilver-Code-QuickStepCore-QSCatalogEntry.m.diff \
+ patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace -E "s|/tmp/QS|${workpath}${config_root}|" ${build.dir}/Configuration/Common.xcconfig
</span><span class="lines">@@ -63,12 +61,13 @@
</span><span class="cx"> build.dir ${worksrcpath}/${name}
</span><span class="cx">
</span><span class="cx"> xcode.project ${name}.xcodeproj
</span><ins>+xcode.target {Quicksilver Distribution}
</ins><span class="cx"> xcode.configuration Release
</span><span class="cx">
</span><span class="cx"> post-build {
</span><span class="cx"> # set Info.plist to be world-writable, so that regular users can
</span><span class="cx"> # set preferences that require writing to Info.plist
</span><del>- file attributes ${build.dir}/build/${xcode.configuration}/${name}.app/Contents/Info.plist -permissions a+w
</del><ins>+ file attributes ${build.dir}/build/${xcode.configuration}/${name}.app/Contents/Info.plist -permissions a+rw
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> destroot {
</span></span></pre></div>
<a id="trunkdportsaquaQuicksilverfilespatchQuicksilverCodeQuickStepCoreQSCatalogEntrymdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Code-QuickStepCore-QSCatalogEntry.m.diff (0 => 127739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Code-QuickStepCore-QSCatalogEntry.m.diff (rev 0)
+++ trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Code-QuickStepCore-QSCatalogEntry.m.diff 2014-11-02 17:50:39 UTC (rev 127739)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+https://github.com/quicksilver/Quicksilver/issues/1953
+https://github.com/quicksilver/Quicksilver/commit/d90bf938c241856803b1a8acaa4b8664b9065921
+--- Quicksilver/Code-QuickStepCore/QSCatalogEntry.m.orig
++++ Quicksilver/Code-QuickStepCore/QSCatalogEntry.m
+@@ -89,7 +89,6 @@ - (void)dealloc {
+ id theSource = [self source];
+ if ([theSource respondsToSelector:@selector(disableEntry:)])
+ [theSource disableEntry:self];
+- dispatch_release(scanQueue);
+ scanQueue = NULL;
+ }
+
</ins></span></pre></div>
<a id="trunkdportsaquaQuicksilverfilespatchQuicksilverQuicksilverxcodeprojprojectpbxprojdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff (127738 => 127739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff 2014-11-02 17:28:52 UTC (rev 127738)
+++ trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff 2014-11-02 17:50:39 UTC (rev 127739)
</span><span class="lines">@@ -1,33 +1,13 @@
</span><del>---- Quicksilver/Quicksilver.xcodeproj/project.pbxproj.orig 2013-03-20 12:27:00.000000000 -0500
-+++ Quicksilver/Quicksilver.xcodeproj/project.pbxproj 2013-04-03 00:13:48.000000000 -0500
-@@ -26,7 +26,6 @@
- isa = PBXAggregateTarget;
- buildConfigurationList = 7F6B3E6D085CE68E000735A8 /* Build configuration list for PBXAggregateTarget "Quicksilver Distribution" */;
- buildPhases = (
-- 7F2F820908A97A440022178B /* Install */,
</del><ins>+https://github.com/quicksilver/Quicksilver/issues/1973
+https://github.com/quicksilver/Quicksilver/commit/4faa3e283920023eb0b0b85cbc79f6e5f3dab517
+--- Quicksilver/Quicksilver.xcodeproj/project.pbxproj.orig
++++ Quicksilver/Quicksilver.xcodeproj/project.pbxproj
+@@ -4469,7 +4469,7 @@
</ins><span class="cx"> );
</span><del>- dependencies = (
- 7F0399FB080EE5D7001A9FA3 /* PBXTargetDependency */,
-@@ -4497,22 +4496,6 @@
</del><ins>+ runOnlyForDeploymentPostprocessing = 0;
</ins><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "#rm -rf \"$BUILT_PRODUCTS_DIR/Quicksilver.app/Contents/PlugIns\"";
</del><ins>+- shellScript = "# \n# Script to append development information to the QS version string\n#\n# The format of the appended version string is as follows:\n#\n# Debug build from branch \"testBranch\": \t\t\tß66:testBranch:Debug\n# Release build from branch \"testBranch\": \t\tß66:testBranch\n# Release build from branch \"master\" or \"release\":\tß66 \n#\n# As described in http://groups.google.com/group/quicksilver---development/browse_thread/thread/b12b53d7680b3c3f\n#\n# Created by Henning Jungkurth on Apr 18 2012\n\nCURRENT_BRANCH=`git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \\\\(.*\\\\)/\\\\1/'`\n\nNEW_VERSION_STRING=\"\"\nif [ $CONFIGURATION == \"Debug\" ] ; then\n\tNEW_VERSION_STRING=\"$QS_INFO_VERSION:$CURRENT_BRANCH:$CONFIGURATION\"\nelse\n\tif [ $CURRENT_BRANCH != \"master\" ] && [ $CURRENT_BRANCH != \"release\" ] ; then\n\t\tNEW_V
ERSION_STRING=\"$QS_INFO_VERSION:$CURRENT_BRANCH\"\n\tfi\nfi\n\nif [ -n \"$NEW_VERSION_STRING\" ] ; then\n\tdefaults write $QS_APP_CONTENTS_FOLDER/Info CFBundleShortVersionString \"\\\"$NEW_VERSION_STRING\\\"\"\nfi";
++ shellScript = "# \n# Script to append development information to the QS version string\n#\n# The format of the appended version string is as follows:\n#\n# Debug build from branch \"testBranch\": \t\t\tß66:testBranch:Debug\n# Release build from branch \"testBranch\": \t\tß66:testBranch\n# Release build from branch \"master\" or \"release\":\tß66 \n#\n# As described in http://groups.google.com/group/quicksilver---development/browse_thread/thread/b12b53d7680b3c3f\n#\n# Created by Henning Jungkurth on Apr 18 2012\n\nCURRENT_BRANCH=`git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \\\\(.*\\\\)/\\\\1/'`\n\nNEW_VERSION_STRING=\"\"\nif [ $CONFIGURATION == \"Debug\" ] ; then\n\tNEW_VERSION_STRING=\"$QS_INFO_VERSION:$CURRENT_BRANCH:$CONFIGURATION\"\nelse\n\tif [ \"$CURRENT_BRANCH\" != \"master\" ] && [ \"$CURRENT_BRANCH\" != \"release\" ]
; then\n\t\tNEW_VERSION_STRING=\"$QS_INFO_VERSION:$CURRENT_BRANCH\"\n\tfi\nfi\n\nif [ -n \"$NEW_VERSION_STRING\" ] ; then\n\tdefaults write $QS_APP_CONTENTS_FOLDER/Info CFBundleShortVersionString \"\\\"$NEW_VERSION_STRING\\\"\"\nfi";
</ins><span class="cx"> };
</span><del>-- 7F2F820908A97A440022178B /* Install */ = {
-- isa = PBXShellScriptBuildPhase;
-- buildActionMask = 8;
-- files = (
-- );
-- inputPaths = (
-- "$(BUILT_PRODUCTS_DIR)/Quicksilver.app",
-- );
-- name = Install;
-- outputPaths = (
-- "$(BUILT_PRODUCTS_DIR)/Quicksilver $(QS_INFO_VERSION).dmg",
-- );
-- runOnlyForDeploymentPostprocessing = 1;
-- shellPath = /bin/sh;
-- shellScript = "#echo \"rsync -auzEv $BUILT_PRODUCTS_DIR/Quicksilver.app /Applications/Quicksilver.app\"\n#rsync -auzEv \"$BUILT_PRODUCTS_DIR/Quicksilver.app/\" /Applications/Quicksilver.app/\n\n#exit\n\nif [ $CONFIGURATION != \"Release\" ]; then\n exit\nfi\n\necho $SRCROOT/Tools/buildDMG.pl -dmgName $PRODUCT_NAME \\\n -volName Quicksilver \\\n -volIcon \"$SRCROOT/Resources/Images/QuicksilverDMG.icns\" \\\n -dmgName \"Quicksilver $QS_INFO_VERSION.0\" \\\n -compressionLevel 9 \\\n -debug \"$BUILT_PRODUCTS_DIR/Quicksilver.app\"\n\n$SRCROOT/Tools/buildDMG.pl -dmgName $PRODUCT_NAME \\\n -volName Quicksilver \\\n -volIcon \"$SRCROOT/Resources/Images/QuicksilverDMG.icns\" \\\n -dmgName \"Quicksilver $QS_
INFO_VERSION.0\" \\\n -compressionLevel 9 \\\n -debug \"$BUILT_PRODUCTS_DIR/Quicksilver.app\"";
-- };
- 7FA4EF1E0913AE44007DB407 /* Release Notes */ = {
</del><ins>+ 7F0399E8080EE58D001A9FA3 /* Remove PlugIns */ = {
</ins><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><del>- buildActionMask = 12;
</del></span></pre>
</div>
</div>
</body>
</html>