[54612] trunk/dports/graphics/wxWidgets26
jwa at macports.org
jwa at macports.org
Thu Jul 30 02:47:44 PDT 2009
Revision: 54612
http://trac.macports.org/changeset/54612
Author: jwa at macports.org
Date: 2009-07-30 02:47:44 -0700 (Thu, 30 Jul 2009)
Log Message:
-----------
patches to allow v2.6.4 to build on 10.5, closing #14931
Modified Paths:
--------------
trunk/dports/graphics/wxWidgets26/Portfile
Added Paths:
-----------
trunk/dports/graphics/wxWidgets26/files/
trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.c.diff
trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.cpp.diff
trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.h.diff
trunk/dports/graphics/wxWidgets26/files/patch.thread.cpp.diff
Modified: trunk/dports/graphics/wxWidgets26/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets26/Portfile 2009-07-30 09:08:00 UTC (rev 54611)
+++ trunk/dports/graphics/wxWidgets26/Portfile 2009-07-30 09:47:44 UTC (rev 54612)
@@ -65,6 +65,13 @@
build.target
+platform darwin 9 {
+ patchfiles patch.MoreFilesX.h.diff \
+ patch.MoreFilesX.c.diff \
+ patch.MoreFilesX.cpp.diff \
+ patch.thread.cpp.diff
+}
+
post-build {
system "cd ${build.dir} && make -C contrib/src/animate"
system "cd ${build.dir} && make -C contrib/src/gizmos"
Added: trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.c.diff
===================================================================
--- trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.c.diff (rev 0)
+++ trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.c.diff 2009-07-30 09:47:44 UTC (rev 54612)
@@ -0,0 +1,58 @@
+--- ../src/mac/carbon/morefilex/MoreFilesX.c 2009-07-25 20:34:52.000000000 +0300
++++ MoreFilesX.c 2009-07-25 20:32:02.000000000 +0300
+@@ -6,7 +6,7 @@
+
+ Version: MoreFilesX 1.0.1
+
+- Copyright: \xA9 1992-2002 by Apple Computer, Inc., all rights reserved.
++ Copyright: © 1992-2002 by Apple Computer, Inc., all rights reserved.
+
+ Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+ ("Apple") in consideration of your agreement to the following terms, and your
+@@ -15,7 +15,7 @@
+ please do not use, install, modify or redistribute this Apple software.
+
+ In consideration of your agreement to abide by the following terms, and subject
+- to these terms, Apple grants you a personal, non-exclusive license, under Apple\xD5s
++ to these terms, Apple grants you a personal, non-exclusive license, under AppleÕs
+ copyrights in this original Apple software (the "Apple Software"), to use,
+ reproduce, modify and redistribute the Apple Software, with or without
+ modifications, in source and/or binary forms; provided that if you redistribute
+@@ -2302,7 +2302,7 @@
+ }
+
+ /*****************************************************************************/
+-
++/*
+ OSErr
+ FSVolumeMount(
+ const void *volMountInfo,
+@@ -2310,23 +2310,23 @@
+ {
+ OSErr result;
+ ParamBlockRec pb;
+-
++ */
+ /* check parameters */
+- require_action(NULL != volRefNum, BadParameter, result = paramErr);
++ /* require_action(NULL != volRefNum, BadParameter, result = paramErr);
+
+ pb.ioParam.ioBuffer = (Ptr)volMountInfo;
+ result = PBVolumeMount(&pb);
+ require_noerr(result, PBVolumeMount);
+-
++ */
+ /* return the volume reference number */
+- *volRefNum = pb.ioParam.ioVRefNum;
++ /* *volRefNum = pb.ioParam.ioVRefNum;
+
+ PBVolumeMount:
+ BadParameter:
+
+ return ( result );
+ }
+-
++ */
+ /*****************************************************************************/
+
+ OSErr
Added: trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.cpp.diff
===================================================================
--- trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.cpp.diff (rev 0)
+++ trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.cpp.diff 2009-07-30 09:47:44 UTC (rev 54612)
@@ -0,0 +1,58 @@
+--- ../src/mac/carbon/morefilex/MoreFilesX.cpp 2009-07-25 20:34:52.000000000 +0300
++++ MoreFilesX.cpp 2009-07-25 20:32:02.000000000 +0300
+@@ -6,7 +6,7 @@
+
+ Version: MoreFilesX 1.0.1
+
+- Copyright: \xA9 1992-2002 by Apple Computer, Inc., all rights reserved.
++ Copyright: © 1992-2002 by Apple Computer, Inc., all rights reserved.
+
+ Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc.
+ ("Apple") in consideration of your agreement to the following terms, and your
+@@ -15,7 +15,7 @@
+ please do not use, install, modify or redistribute this Apple software.
+
+ In consideration of your agreement to abide by the following terms, and subject
+- to these terms, Apple grants you a personal, non-exclusive license, under Apple\xD5s
++ to these terms, Apple grants you a personal, non-exclusive license, under AppleÕs
+ copyrights in this original Apple software (the "Apple Software"), to use,
+ reproduce, modify and redistribute the Apple Software, with or without
+ modifications, in source and/or binary forms; provided that if you redistribute
+@@ -2304,7 +2304,7 @@
+ }
+
+ /*****************************************************************************/
+-
++/*
+ OSErr
+ FSVolumeMount(
+ const void *volMountInfo,
+@@ -2312,23 +2312,23 @@
+ {
+ OSErr result;
+ ParamBlockRec pb;
+-
++*/
+ /* check parameters */
+- require_action(NULL != volRefNum, BadParameter, result = paramErr);
++ /* require_action(NULL != volRefNum, BadParameter, result = paramErr);
+
+ pb.ioParam.ioBuffer = (Ptr)volMountInfo;
+ result = PBVolumeMount(&pb);
+ require_noerr(result, PBVolumeMount);
+-
++ */
+ /* return the volume reference number */
+- *volRefNum = pb.ioParam.ioVRefNum;
++ /* *volRefNum = pb.ioParam.ioVRefNum;
+
+ PBVolumeMount:
+ BadParameter:
+
+ return ( result );
+ }
+-
++ */
+ /*****************************************************************************/
+
+ OSErr
Added: trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.h.diff
===================================================================
--- trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.h.diff (rev 0)
+++ trunk/dports/graphics/wxWidgets26/files/patch.MoreFilesX.h.diff 2009-07-30 09:47:44 UTC (rev 54612)
@@ -0,0 +1,20 @@
+--- ../src/mac/carbon/morefilex/MoreFilesX.h 2009-07-25 20:34:52.000000000 +0300
++++ MoreFilesX.h 2009-07-25 20:36:09.000000000 +0300
+@@ -1479,14 +1479,14 @@
+ */
+
+ /*****************************************************************************/
+-
++/*
+ #pragma mark FSVolumeMount
+
+ OSErr
+ FSVolumeMount(
+- const void *volMountInfo,
++ UInt8 *volMountInfo,
+ FSVolumeRefNum *volRefNum);
+-
++*/
+ /*
+ The VolumeMount function mounts a volume using a volume mounting
+ information record.
Added: trunk/dports/graphics/wxWidgets26/files/patch.thread.cpp.diff
===================================================================
--- trunk/dports/graphics/wxWidgets26/files/patch.thread.cpp.diff (rev 0)
+++ trunk/dports/graphics/wxWidgets26/files/patch.thread.cpp.diff 2009-07-30 09:47:44 UTC (rev 54612)
@@ -0,0 +1,11 @@
+--- ../src/mac/carbon/thread.cpp 2009-07-25 20:46:28.000000000 +0300
++++ thread.cpp 2009-07-25 20:47:04.000000000 +0300
+@@ -1019,7 +1019,7 @@
+ wxThreadInternal *pthread = thread->m_internal;
+
+ // add to TLS so that This() will work
+- verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , (long) thread ) ) ;
++ verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , (void *) thread ) ) ;
+
+ // have to declare this before pthread_cleanup_push() which defines a
+ // block!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090730/76636d77/attachment.html>
More information about the macports-changes
mailing list