Added patch for bug 2 (in a "wxMac_additions" folder), to be applied to Mac releases until support for OS X 10.5 is dropped. Noted this in mac/compile.txt.

This commit is contained in:
windinthew 2012-02-13 20:19:22 +00:00
parent 431aa110e2
commit 195351c0c6
2 changed files with 31 additions and 9 deletions

View File

@ -4,8 +4,9 @@ Authors:
Dominic Mazzoni
================================================================
This version is currently accurate for Audacity version 1.3.1.
Last Updated: February 3, 2006
This version was last updated February 13, 2012.
Audacity 2.0.0 requires wxMac 2.8.12.
If the advice here is inaccurate or incomplete, please
email audacity-devel@lists.sourceforge.net.
================================================================
@ -40,14 +41,14 @@ wxWindows is available from http://www.wxwindows.org.
Similar to the Linux kernel, wxWindows is available as
stable and development branches.
The best way to compile Audacity is to download wxMac 2.8.10.
The best way to compile Audacity is to download wxMac 2.8.12.
For step 1, just download wxMac 2.8.10 from:
For step 1, just download wxMac 2.8.12 from:
http://www.wxwindows.org/downloads/
Uncompress wxMac from the command line by typing:
tar xvzf wxMac-2.8.10.tar.gz
tar xvzf wxMac-2.8.12.tar.gz
--------------------------
STEP 2: Download Audacity
@ -61,11 +62,18 @@ command:
svn checkout http://audacity.googlecode.com/svn/audacity-src/trunk/ audacity-read-only
----------------------------------
STEP 3: Compile and install wxMac
----------------------------------
-----------------------------------------
STEP 3: Patch, compile and install wxMac
-----------------------------------------
cd wxMac-2.8.10
* Apply "wxMac_bug_2_10.5.8_PPC.patch" in the
"mac/wxMac_additions" folder in the Audacity sources.
This has to be applied until we drop support for OS X 10.5.
* Apply any other wxMac patches in the "mac" directory that
are relevant to the version of wxMac you are compiling.
cd wxMac-2.8.12
mkdir macbuild
cd macbuild
../configure --disable-shared

View File

@ -0,0 +1,14 @@
diff -wruN orig/wxMac-2.8.12/src/unix/utilsunx.cpp wxMac-2.8.12/src/unix/utilsunx.cpp
--- orig/wxMac-2.8.12/src/unix/utilsunx.cpp 2010-04-15 04:25:58.000000000 -0500
+++ wxMac-2.8.12/src/unix/utilsunx.cpp 2011-03-30 00:07:28.000000000 -0500
@@ -1202,8 +1202,8 @@
wxMAC_MachPortEndProcessDetect helper function. Though in practice
this shouldn't be a problem since it wasn't prototyped anywhere.
*/
-#define USE_OLD_DARWIN_END_PROCESS_DETECT (defined(__DARWIN__) && defined(__WXMAC__))
-// #define USE_OLD_DARWIN_END_PROCESS_DETECT 0
+// #define USE_OLD_DARWIN_END_PROCESS_DETECT (defined(__DARWIN__) && defined(__WXMAC__))
+#define USE_OLD_DARWIN_END_PROCESS_DETECT 0
// wxMac doesn't use the same process end detection mechanisms so we don't
// need wxExecute-related helpers for it.