[127739] trunk/dports/aqua/Quicksilver

ryandesign at macports.org ryandesign at macports.org
Sun Nov 2 09:50:39 PST 2014 

Revision: 127739
          https://trac.macports.org/changeset/127739
Author:   ryandesign at macports.org
Date:     2014-11-02 09:50:39 -0800 (Sun, 02 Nov 2014)
Log Message:
-----------
Quicksilver: update to 1.2.0

Modified Paths:
--------------
    trunk/dports/aqua/Quicksilver/Portfile
    trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff

Added Paths:
-----------
    trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Code-QuickStepCore-QSCatalogEntry.m.diff

Modified: trunk/dports/aqua/Quicksilver/Portfile
===================================================================
--- 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)
@@ -7,11 +7,8 @@
 PortGroup               xcode 1.0
 PortGroup               xcodeversion 1.0
 
-# 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
+github.setup            quicksilver Quicksilver 1.2.0-final v
+version                 1.2.0
 platforms               darwin
 maintainers             ryandesign openmaintainer
 categories              aqua sysutils
@@ -43,7 +40,8 @@
     file mkdir ${workpath}${config_root}
 }
 
-patchfiles              patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff
+patchfiles-append       patch-Quicksilver-Code-QuickStepCore-QSCatalogEntry.m.diff \
+                        patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff
 
 post-patch {
     reinplace -E "s|/tmp/QS|${workpath}${config_root}|" ${build.dir}/Configuration/Common.xcconfig
@@ -63,12 +61,13 @@
 build.dir               ${worksrcpath}/${name}
 
 xcode.project           ${name}.xcodeproj
+xcode.target            {Quicksilver Distribution}
 xcode.configuration     Release
 
 post-build {
     # set Info.plist to be world-writable, so that regular users can
     # set preferences that require writing to Info.plist
-    file attributes ${build.dir}/build/${xcode.configuration}/${name}.app/Contents/Info.plist -permissions a+w
+    file attributes ${build.dir}/build/${xcode.configuration}/${name}.app/Contents/Info.plist -permissions a+rw
 }
 
 destroot {

Added: trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Code-QuickStepCore-QSCatalogEntry.m.diff
===================================================================
--- 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)
@@ -0,0 +1,12 @@
+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;
+ }
+ 

Modified: trunk/dports/aqua/Quicksilver/files/patch-Quicksilver-Quicksilver.xcodeproj-project.pbxproj.diff
===================================================================
--- 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)
@@ -1,33 +1,13 @@
---- 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 */,
+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 @@
  			);
- 			dependencies = (
- 				7F0399FB080EE5D7001A9FA3 /* PBXTargetDependency */,
-@@ -4497,22 +4496,6 @@
+ 			runOnlyForDeploymentPostprocessing = 0;
  			shellPath = /bin/sh;
- 			shellScript = "#rm -rf \"$BUILT_PRODUCTS_DIR/Quicksilver.app/Contents/PlugIns\"";
+-			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";
++			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\td
 efaults write $QS_APP_CONTENTS_FOLDER/Info CFBundleShortVersionString \"\\\"$NEW_VERSION_STRING\\\"\"\nfi";
  		};
--		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 */ = {
+ 		7F0399E8080EE58D001A9FA3 /* Remove PlugIns */ = {
  			isa = PBXShellScriptBuildPhase;
- 			buildActionMask = 12;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141102/8cff515e/attachment-0001.html>

More information about the macports-changes mailing list