220 | | => 'http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/qt-mac-free-3.3.6.tar.gz', |
| 220 | => 'http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/qt-mac-free-3.3.8.tar.gz', |
| 221 | # qt3 Leopard patch from http://fink.cvs.sourceforge.net/*checkout*/fink/dists/10.4/unstable/main/finkinfo/graphics/qt3mac.patch2 |
| 222 | 'pre-conf' |
| 223 | => 'echo "diff -ruN config.tests/mac/mac_version.test config.tests/mac/mac_version.test |
| 224 | --- config.tests/mac/mac_version.test 2004-04-23 09:40:40.000000000 -0700 |
| 225 | +++ config.tests/mac/mac_version.test 2007-09-10 09:46:37.000000000 -0700 |
| 226 | @@ -21,7 +21,7 @@ |
| 227 | echo \"#include <stdio.h>\" >>\$TSTFILE |
| 228 | echo \"int main() {\" >>\$TSTFILE |
| 229 | echo \" long gestalt_version;\" >>\$TSTFILE |
| 230 | -echo \" fprintf(stdout, \\\\\"%d\\\\\\\\\\\\\\\\n\\\\\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);\" >>\$TSTFILE |
| 231 | +/bin/echo \" fprintf(stdout, \\\\\"%d\\\\\\\\\\\\\\\\n\\\\\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);\" >>\$TSTFILE |
| 232 | echo \" return 1;\" >>\$TSTFILE |
| 233 | echo \"}\" >>\$TSTFILE |
| 234 | |
| 235 | diff -ruN src/tools/qglobal.h src/tools/qglobal.h |
| 236 | --- src/tools/qglobal.h 2007-02-02 06:01:04.000000000 -0800 |
| 237 | +++ src/tools/qglobal.h 2007-09-10 09:31:43.000000000 -0700 |
| 238 | @@ -183,7 +183,10 @@ |
| 239 | # if !defined(MAC_OS_X_VERSION_10_4) |
| 240 | # define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1 |
| 241 | # endif |
| 242 | -# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4) |
| 243 | +# if !defined(MAC_OS_X_VERSION_10_5) |
| 244 | +# define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1 |
| 245 | +# endif |
| 246 | +# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) |
| 247 | # error \"This version of Mac OS X is unsupported\" |
| 248 | # endif |
| 249 | #endif |
| 250 | --- src/kernel/qt_mac.h 2007-02-02 15:01:13.000000000 +0100 |
| 251 | +++ src/kernel/qt_mac.h 2007-10-29 13:14:12.000000000 +0100 |
| 252 | @@ -54,7 +54,7 @@ |
| 253 | # define QMAC_DEFAULT_STYLE \"QMacStyle\" //DefaultStyle |
| 254 | #endif |
| 255 | |
| 256 | -#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || QT_MACOSX_VERSION >= 0x1030 |
| 257 | +#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || (QT_MACOSX_VERSION >= 0x1030 && QT_MACOSX_VERSION <= 0x1040) |
| 258 | # define QMAC_NO_FAKECURSOR |
| 259 | #endif |
| 260 | |
| 261 | --- src/kernel/qcursor_mac.cpp 2007-02-02 15:01:16.000000000 +0100 |
| 262 | +++ src/kernel/qcursor_mac.cpp 2007-10-29 15:02:36.000000000 +0100 |
| 263 | @@ -177,7 +177,9 @@ |
| 264 | #ifdef QMAC_USE_BIG_CURSOR_API |
| 265 | char *big_cursor_name; |
| 266 | #endif |
| 267 | +#ifdef QMAC_NO_FAKECURSOR |
| 268 | CursorImageRec *ci; |
| 269 | +#endif |
| 270 | struct { |
| 271 | QMacAnimateCursor *anim; |
| 272 | ThemeCursor curs; |
| 273 | @@ -257,8 +259,10 @@ |
| 274 | if(type == TYPE_CursPtr) { |
| 275 | if(curs.cp.hcurs && curs.cp.my_cursor) |
| 276 | free(curs.cp.hcurs); |
| 277 | +#ifdef QMAC_NO_FAKECURSOR |
| 278 | } else if(type == TYPE_CursorImage) { |
| 279 | free(curs.ci); |
| 280 | +#endif |
| 281 | #ifdef QMAC_USE_BIG_CURSOR_API |
| 282 | } else if(type == TYPE_BigCursor) { |
| 283 | QDUnregisterNamedPixMapCursur(curs.big_cursor_name); |
| 284 | " | patch -p0 |
| 285 | ', |