New Ticket     Wiki     Browse Source     Timeline     Roadmap     Ticket Reports     Search

Ticket #16109: patch-leopard

File patch-leopard, 2.5 KB (added by cedayiv@…, 3 years ago)

Additional patch file for leopard

Line 
1diff -ur config.tests.orig/mac/mac_version.test config.tests/mac/mac_version.test
2--- config.tests.orig/mac/mac_version.test      2004-04-23 09:40:40.000000000 -0700
3+++ config.tests/mac/mac_version.test   2009-02-04 13:33:19.000000000 -0800
4@@ -21,7 +21,7 @@
5 echo "#include <stdio.h>" >>$TSTFILE
6 echo "int main() {" >>$TSTFILE
7 echo "  long gestalt_version;" >>$TSTFILE
8-echo "  fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE
9+/bin/echo "  fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE
10 echo "  return 1;" >>$TSTFILE
11 echo "}" >>$TSTFILE
12 
13diff -ur src.orig/tools/qglobal.h src/tools/qglobal.h
14--- src.orig/tools/qglobal.h    2007-02-02 06:01:04.000000000 -0800
15+++ src/tools/qglobal.h 2009-02-04 13:35:58.000000000 -0800
16@@ -183,7 +183,10 @@
17 #  if !defined(MAC_OS_X_VERSION_10_4)
18 #       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1
19 #  endif
20-#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
21+#  if !defined(MAC_OS_X_VERSION_10_5)
22+#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1
23+#  endif
24+#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)
25 #    error "This version of Mac OS X is unsupported"
26 #  endif
27 #endif
28
29diff -ur src.orig/kernel/qt_mac.h src/kernel/qt_mac.h
30--- src.orig/kernel/qt_mac.h    2007-02-02 06:01:13.000000000 -0800
31+++ src/kernel/qt_mac.h 2009-02-04 13:59:57.000000000 -0800
32@@ -54,7 +54,7 @@
33 # define QMAC_DEFAULT_STYLE "QMacStyle" //DefaultStyle
34 #endif
35 
36-#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || QT_MACOSX_VERSION >= 0x1030
37+#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || (QT_MACOSX_VERSION >= 0x1030 && QT_MACOSX_VERSION <= 0x1040)
38 # define QMAC_NO_FAKECURSOR
39 #endif
40 
41diff -ur src.orig/kernel/qcursor_mac.cpp src/kernel/qcursor_mac.cpp
42--- src.orig/kernel/qcursor_mac.cpp     2007-02-02 06:01:16.000000000 -0800
43+++ src/kernel/qcursor_mac.cpp  2009-02-04 14:01:39.000000000 -0800
44@@ -177,7 +177,9 @@
45 #ifdef QMAC_USE_BIG_CURSOR_API
46        char *big_cursor_name;
47 #endif
48+#ifdef QMAC_NO_FAKECURSOR
49        CursorImageRec *ci;
50+#endif
51        struct {
52            QMacAnimateCursor *anim;
53            ThemeCursor curs;
54@@ -257,8 +259,10 @@
55     if(type == TYPE_CursPtr) {
56        if(curs.cp.hcurs && curs.cp.my_cursor)
57            free(curs.cp.hcurs);
58+#ifdef QMAC_NO_FAKECURSOR
59     } else if(type == TYPE_CursorImage) {
60        free(curs.ci);
61+#endif
62 #ifdef QMAC_USE_BIG_CURSOR_API
63     } else if(type == TYPE_BigCursor) {
64        QDUnregisterNamedPixMapCursur(curs.big_cursor_name);