wxmac stable port information

Package: wxmac
Version: 2.6.4
Revision: 5
Distribution: 10.5, 10.6
Architecture: i386, powerpc
GCC: 4.0
Description: Cross-platform GUI API - mac/carbon version
License: GPL
Maintainer: None

BuildDepends: <<
cctools,
expat1,
gettext-bin,
gettext-tools,
fink (>= 0.24.12),
libgettext3-dev,
libgl-dev,
libiconv-dev,
libjpeg,
libpng3,
libtiff
<<
Depends: %N-shlibs (= %v-%r), macosx
Conflicts: wxgtk, wxcocoa, wxmac, wxgtk2.8, wxmac28, wxmac28-unicode, wxcocoa29, wxcocoa292, wxcocoa293
Replaces: wxgtk, wxcocoa, wxmac, wxgtk2.8, wxmac28, wxmac28-unicode, wxcocoa29, wxcocoa292, wxcocoa293
BuildDependsOnly: True

Source: mirror:sourceforge:wxwindows/wxWidgets-%v.tar.bz2
Source-MD5: 3df4d9f1d3d785fcc6d66dbbf4b672b6
SourceDirectory: wxWidgets-%v

PatchFile: %n.patch
PatchFile-MD5: 56e3f1bbe7b7302ad2a32a3c20959fc9

# Avoid linkng old version of self
# http://sourceforge.net/mailarchive/message.php?msg_id=14865861
NoSetLDFLAGS: true
SetLIBRARY_PATH: %p/lib

NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --disable-gtk2 --without-sdl --without-odbc --with-opengl
InstallScript: <<
%{default_script}
/bin/rm %i/bin/wx-config
/bin/ln -s %p/lib/wx/config/mac-ansi-release-2.6 %i/bin/wx-config
/usr/bin/install -m 755 -d %i/share/doc/%n
/bin/cp -R docs/ %i/share/doc/%n
/usr/bin/install -m 755 -d %i/share/wxmac
/usr/bin/install -m 644 src/mac/carbon/wxmac.icns %i/share/wxmac
<<
SplitOff: <<
Package: %N-shlibs
Depends: libpng3-shlibs, libjpeg-shlibs, libtiff-shlibs, expat1-shlibs, libgl-shlibs
Files: lib/libwx_*-2.6.0.dylib lib/libwx_*-2.6.0.4.0.dylib
Shlibs: <<
%p/lib/libwx_base_carbon-2.6.0.dylib 4.0.0 %n (>= 2.6.4-1)
%p/lib/libwx_base_carbon_net-2.6.0.dylib 4.0.0 %n (>= 2.6.4-1)
%p/lib/libwx_base_carbon_xml-2.6.0.dylib 4.0.0 %n (>= 2.6.4-1)
%p/lib/libwx_mac_adv-2.6.0.dylib 4.0.0 %n (>= 2.6.4-1)
%p/lib/libwx_mac_core-2.6.0.dylib 4.0.0 %n (>= 2.6.4-1)
%p/lib/libwx_mac_gl-2.6.0.dylib 4.0.0 %n (>= 2.6.4-1)
%p/lib/libwx_mac_html-2.6.0.dylib 4.0.0 %n (>= 2.6.4-1)
%p/lib/libwx_mac_media-2.6.0.dylib 4.0.0 %n (>= 2.6.4-1)
%p/lib/libwx_mac_qa-2.6.0.dylib 4.0.0 %n (>= 2.6.4-1)
%p/lib/libwx_mac_xrc-2.6.0.dylib 4.0.0 %n (>= 2.6.4-1)
<<
DocFiles: docs/licence.txt
<<

Homepage: http://www.wxwidgets.org/
DescDetail: <<
In addition to common and advanced GUI facilities such as
frames, scrolling windows, toolbars, tree controls, icons,
device contexts, printing, splitter windows and so on, there are
wrappers for common file operations, and facilities for writing
TCP/IP applications, thread handling, and more. Where certain
features are not available on a platform, such as MDI and tree
controls on Unix, they are emulated.
<<

wxmac stable port .patch

diff -ruN wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.c wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.c
--- wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.c 2004-12-12 04:58:35.000000000 -0500
+++ wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.c 2011-04-27 11:02:11.000000000 -0400
@@ -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
diff -ruN wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.cpp wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.cpp
--- wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.cpp 2004-10-17 06:52:37.000000000 -0400
+++ wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.cpp 2011-04-27 11:04:40.000000000 -0400
@@ -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
diff -ruN wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.h wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.h
--- wxWidgets-2.6.4-orig/src/mac/carbon/morefilex/MoreFilesX.h 2004-12-12 05:00:39.000000000 -0500
+++ wxWidgets-2.6.4/src/mac/carbon/morefilex/MoreFilesX.h 2011-04-27 11:05:46.000000000 -0400
@@ -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.
diff -ruN wxWidgets-2.6.4-orig/src/mac/carbon/thread.cpp wxWidgets-2.6.4/src/mac/carbon/thread.cpp
--- wxWidgets-2.6.4-orig/src/mac/carbon/thread.cpp 2005-07-24 09:36:12.000000000 -0400
+++ wxWidgets-2.6.4/src/mac/carbon/thread.cpp 2011-04-27 11:06:38.000000000 -0400
@@ -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!

wxmac _unstable_ port .patch