203 | | => 'http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/qt-mac-free-3.3.6.tar.gz', |
| 203 | => 'http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/qt-mac-free-3.3.8.tar.gz', |
| 204 | 'pre-conf' => |
| 205 | 'echo \'' . q^ |
| 206 | diff -ru qt-mac-free-3.3.8.orig/config.tests/mac/mac_version.test qt-mac-free-3.3.8.new/config.tests/mac/mac_version.test |
| 207 | --- qt-mac-free-3.3.8.orig/config.tests/mac/mac_version.test 2004-04-24 02:40:40.000000000 +1000 |
| 208 | +++ qt-mac-free-3.3.8.new/config.tests/mac/mac_version.test 2008-01-01 10:33:55.000000000 +1100 |
| 209 | @@ -17,13 +17,17 @@ |
| 210 | TSTFILE=mac_version.cpp |
| 211 | |
| 212 | rm -f $TSTFILE |
| 213 | -echo "#include <Carbon/Carbon.h>" >$TSTFILE |
| 214 | -echo "#include <stdio.h>" >>$TSTFILE |
| 215 | -echo "int main() {" >>$TSTFILE |
| 216 | -echo " long gestalt_version;" >>$TSTFILE |
| 217 | -echo " fprintf(stdout, \"%d\\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE |
| 218 | -echo " return 1;" >>$TSTFILE |
| 219 | -echo "}" >>$TSTFILE |
| 220 | +cat << END >$TSTFILE |
| 221 | +#include <Carbon/Carbon.h> |
| 222 | +#include <stdio.h> |
| 223 | +int main() { |
| 224 | + long gestalt_version; |
| 225 | + if (Gestalt(gestaltSystemVersion, &gestalt_version) != noErr) |
| 226 | + gestalt_version=0; |
| 227 | + fprintf(stdout, "0x%x\n", gestalt_version); |
| 228 | + return 1; |
| 229 | +} |
| 230 | +END |
| 231 | |
| 232 | COMPILE_ERROR=yes |
| 233 | if [ "$VERBOSE" = "yes" ]; then |
| 234 | diff -ru qt-mac-free-3.3.8.orig/include/qglobal.h qt-mac-free-3.3.8.new/include/qglobal.h |
| 235 | --- qt-mac-free-3.3.8.orig/include/qglobal.h 2007-02-03 01:01:04.000000000 +1100 |
| 236 | +++ qt-mac-free-3.3.8.new/include/qglobal.h 2008-01-01 10:47:28.000000000 +1100 |
| 237 | @@ -183,7 +183,10 @@ |
| 238 | # if !defined(MAC_OS_X_VERSION_10_4) |
| 239 | # define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1 |
| 240 | # endif |
| 241 | -# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4) |
| 242 | +# if !defined(MAC_OS_X_VERSION_10_5) |
| 243 | +# define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1 |
| 244 | +# endif |
| 245 | +# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) |
| 246 | # error "This version of Mac OS X is unsupported" |
| 247 | # endif |
| 248 | #endif |
| 249 | diff -ru qt-mac-free-3.3.8.orig/src/kernel/qcursor_mac.cpp qt-mac-free-3.3.8.new/src/kernel/qcursor_mac.cpp |
| 250 | --- qt-mac-free-3.3.8.orig/src/kernel/qcursor_mac.cpp 2007-02-03 01:01:16.000000000 +1100 |
| 251 | +++ qt-mac-free-3.3.8.new/src/kernel/qcursor_mac.cpp 2008-01-01 10:45:15.000000000 +1100 |
| 252 | @@ -177,7 +177,9 @@ |
| 253 | #ifdef QMAC_USE_BIG_CURSOR_API |
| 254 | char *big_cursor_name; |
| 255 | #endif |
| 256 | +#ifdef QMAC_NO_FAKECURSOR |
| 257 | CursorImageRec *ci; |
| 258 | +#endif |
| 259 | struct { |
| 260 | QMacAnimateCursor *anim; |
| 261 | ThemeCursor curs; |
| 262 | @@ -258,7 +260,9 @@ |
| 263 | if(curs.cp.hcurs && curs.cp.my_cursor) |
| 264 | free(curs.cp.hcurs); |
| 265 | } else if(type == TYPE_CursorImage) { |
| 266 | +#ifdef QMAC_NO_FAKECURSOR |
| 267 | free(curs.ci); |
| 268 | +#endif |
| 269 | #ifdef QMAC_USE_BIG_CURSOR_API |
| 270 | } else if(type == TYPE_BigCursor) { |
| 271 | QDUnregisterNamedPixMapCursur(curs.big_cursor_name); |
| 272 | diff -ru qt-mac-free-3.3.8.orig/src/kernel/qt_mac.h qt-mac-free-3.3.8.new/src/kernel/qt_mac.h |
| 273 | --- qt-mac-free-3.3.8.orig/src/kernel/qt_mac.h 2007-02-03 01:01:13.000000000 +1100 |
| 274 | +++ qt-mac-free-3.3.8.new/src/kernel/qt_mac.h 2008-01-01 18:03:04.000000000 +1100 |
| 275 | @@ -54,7 +54,7 @@ |
| 276 | # define QMAC_DEFAULT_STYLE "QMacStyle" //DefaultStyle |
| 277 | #endif |
| 278 | |
| 279 | -#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || QT_MACOSX_VERSION >= 0x1030 |
| 280 | +#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || (QT_MACOSX_VERSION >= 0x1030 && QT_MACOSX_VERSION < 0x1050) |
| 281 | # define QMAC_NO_FAKECURSOR |
| 282 | #endif |
| 283 | |
| 284 | diff -ru qt-mac-free-3.3.8.orig/src/tools/qglobal.h qt-mac-free-3.3.8.new/src/tools/qglobal.h |
| 285 | --- qt-mac-free-3.3.8.orig/src/tools/qglobal.h 2007-02-03 01:01:04.000000000 +1100 |
| 286 | +++ qt-mac-free-3.3.8.new/src/tools/qglobal.h 2008-01-01 10:47:28.000000000 +1100 |
| 287 | @@ -183,7 +183,10 @@ |
| 288 | # if !defined(MAC_OS_X_VERSION_10_4) |
| 289 | # define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1 |
| 290 | # endif |
| 291 | -# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4) |
| 292 | +# if !defined(MAC_OS_X_VERSION_10_5) |
| 293 | +# define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1 |
| 294 | +# endif |
| 295 | +# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5) |
| 296 | # error "This version of Mac OS X is unsupported" |
| 297 | # endif |
| 298 | #endif |
| 299 | ^ . '\' | patch -p1', |