[103987] trunk/dports/devel/curlhandle

ryandesign at macports.org ryandesign at macports.org
Mon Mar 11 20:46:46 PDT 2013


Revision: 103987
          https://trac.macports.org/changeset/103987
Author:   ryandesign at macports.org
Date:     2013-03-11 20:46:46 -0700 (Mon, 11 Mar 2013)
Log Message:
-----------
curlhandle: fix build on older OS X and with older compilers

Modified Paths:
--------------
    trunk/dports/devel/curlhandle/Portfile

Added Paths:
-----------
    trunk/dports/devel/curlhandle/files/
    trunk/dports/devel/curlhandle/files/patch-CURLFTPSession.m.diff
    trunk/dports/devel/curlhandle/files/patch-CURLHandle.xcodeproj-project.pbxproj.diff

Modified: trunk/dports/devel/curlhandle/Portfile
===================================================================
--- trunk/dports/devel/curlhandle/Portfile	2013-03-12 00:13:16 UTC (rev 103986)
+++ trunk/dports/devel/curlhandle/Portfile	2013-03-12 03:46:46 UTC (rev 103987)
@@ -21,7 +21,8 @@
 
 depends_lib         port:curl
 
-build.dir           ${worksrcpath}/${my_name}Source
+patch.dir           ${worksrcpath}/${my_name}Source
+build.dir           ${patch.dir}
 
 post-extract {
     # Replace the bundled curl library with ours.
@@ -29,6 +30,9 @@
     ln -s ${prefix}/lib/libcurl.dylib ${build.dir}
 }
 
+patchfiles          patch-CURLFTPSession.m.diff \
+                    patch-CURLHandle.xcodeproj-project.pbxproj.diff
+
 xcode.target        ${my_name}
 
 xcode.destroot.type framework

Added: trunk/dports/devel/curlhandle/files/patch-CURLFTPSession.m.diff
===================================================================
--- trunk/dports/devel/curlhandle/files/patch-CURLFTPSession.m.diff	                        (rev 0)
+++ trunk/dports/devel/curlhandle/files/patch-CURLFTPSession.m.diff	2013-03-12 03:46:46 UTC (rev 103987)
@@ -0,0 +1,14 @@
+Fix build with compilers older than Apple Clang 4.0 by not using Objective-C array literals
+https://github.com/karelia/CurlHandle/issues/8
+--- CURLFTPSession.m.orig	2012-11-29 08:34:27.000000000 -0600
++++ CURLFTPSession.m	2013-03-11 20:07:51.000000000 -0500
+@@ -350,7 +350,8 @@
+ {
+     NSString *from = [NSString stringWithFormat:@"RNFR %@", [fromPath lastPathComponent]];
+     NSString *to = [NSString stringWithFormat:@"RNTO %@", toPath];
+-    return [self executeCustomCommands:@[from, to]
++    id commands[] = {from, to};
++    return [self executeCustomCommands:[NSArray arrayWithObjects:commands count:2]
+                            inDirectory:[fromPath stringByDeletingLastPathComponent]
+          createIntermediateDirectories:NO
+                                  error:error];

Added: trunk/dports/devel/curlhandle/files/patch-CURLHandle.xcodeproj-project.pbxproj.diff
===================================================================
--- trunk/dports/devel/curlhandle/files/patch-CURLHandle.xcodeproj-project.pbxproj.diff	                        (rev 0)
+++ trunk/dports/devel/curlhandle/files/patch-CURLHandle.xcodeproj-project.pbxproj.diff	2013-03-12 03:46:46 UTC (rev 103987)
@@ -0,0 +1,40 @@
+Fix build on OS X 10.7 Lion and older by using CoreServices instead of CFNetwork
+https://github.com/karelia/CurlHandle/issues/9
+--- CURLHandle.xcodeproj/project.pbxproj.orig	2012-11-29 08:34:27.000000000 -0600
++++ CURLHandle.xcodeproj/project.pbxproj	2013-03-11 22:31:16.000000000 -0500
+@@ -40,7 +40,7 @@
+ 		275707691503E21D00363512 /* CURLFTPSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 275707671503E21C00363512 /* CURLFTPSession.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 		2757076A1503E21D00363512 /* CURLFTPSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 275707681503E21C00363512 /* CURLFTPSession.m */; };
+ 		277D77E01603804900906915 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
+-		277D77E2160380AF00906915 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 277D77E1160380AF00906915 /* CFNetwork.framework */; };
++		50ED7E2816EED8D000723020 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50ED7E2716EED8D000723020 /* CoreServices.framework */; };
+ 		79B96CAC0A6360E00060AC12 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79B96CA70A6360E00060AC12 /* SystemConfiguration.framework */; };
+ 		79B96CBF0A6360F90060AC12 /* CURLHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 79B96CBB0A6360F90060AC12 /* CURLHandle.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 		79B96CC00A6360F90060AC12 /* CURLHandle.m in Sources */ = {isa = PBXBuildFile; fileRef = 79B96CBC0A6360F90060AC12 /* CURLHandle.m */; };
+@@ -310,7 +310,7 @@
+ 		27229B3914C83905007D0FF1 /* CURLProtocol.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CURLProtocol.m; sourceTree = "<group>"; };
+ 		275707671503E21C00363512 /* CURLFTPSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CURLFTPSession.h; sourceTree = "<group>"; };
+ 		275707681503E21C00363512 /* CURLFTPSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CURLFTPSession.m; sourceTree = "<group>"; };
+-		277D77E1160380AF00906915 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
++		50ED7E2716EED8D000723020 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
+ 		32DBCF5E0370ADEE00C91783 /* CURLHandle_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CURLHandle_Prefix.pch; sourceTree = "<group>"; };
+ 		795946890AA88D0000EBF548 /* ResumableHTTPUploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResumableHTTPUploader.h; sourceTree = "<group>"; };
+ 		7959468A0AA88D0000EBF548 /* ResumableHTTPUploader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResumableHTTPUploader.m; sourceTree = "<group>"; };
+@@ -562,7 +562,7 @@
+ 			files = (
+ 				809AE1C81602C7DD001D02E1 /* libcurl.dylib in Frameworks */,
+ 				277D77E01603804900906915 /* Foundation.framework in Frameworks */,
+-				277D77E2160380AF00906915 /* CFNetwork.framework in Frameworks */,
++				50ED7E2816EED8D000723020 /* CoreServices.framework in Frameworks */,
+ 				79B96CAC0A6360E00060AC12 /* SystemConfiguration.framework in Frameworks */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+@@ -633,7 +633,7 @@
+ 			children = (
+ 				79B96CA70A6360E00060AC12 /* SystemConfiguration.framework */,
+ 				0867D69BFE84028FC02AAC07 /* Foundation.framework */,
+-				277D77E1160380AF00906915 /* CFNetwork.framework */,
++				50ED7E2716EED8D000723020 /* CoreServices.framework */,
+ 			);
+ 			name = "Linked Frameworks";
+ 			sourceTree = "<group>";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130311/6d04b32c/attachment.html>


More information about the macports-changes mailing list