[47854] trunk/dports/aqua/qt3-mac

[macsforever2000 at macports.org]

Revision: 47854
          http://trac.macports.org/changeset/47854
Author:   macsforever2000 at macports.org
Date:     2009-03-08 11:11:43 -0700 (Sun, 08 Mar 2009)
Log Message:
-----------
Fix for compiling on Leopard. (#13208)

Modified Paths:
--------------
    trunk/dports/aqua/qt3-mac/Portfile

Added Paths:
-----------
    trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff

Modified: trunk/dports/aqua/qt3-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt3-mac/Portfile	2009-03-08 17:46:29 UTC (rev 47853)
+++ trunk/dports/aqua/qt3-mac/Portfile	2009-03-08 18:11:43 UTC (rev 47854)
@@ -68,7 +68,8 @@
 
 platform darwin	{
 	patchfiles		patch-src-qt_install.pri \
-					patch-mkspecs-qmake.conf
+					patch-mkspecs-qmake.conf \
+          qt3-leopard.diff
 	post-destroot {
 		system "sh ${filespath}/fix_install_names.sh '${prefix}' '${destroot}'"
 		set appPath ${destroot}/Applications/MacPorts/Qt3

Added: trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff
===================================================================
--- trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff	                        (rev 0)
+++ trunk/dports/aqua/qt3-mac/files/qt3-leopard.diff	2009-03-08 18:11:43 UTC (rev 47854)
@@ -0,0 +1,74 @@
+---
+ config.tests/mac/mac_version.test |    2 +-
+ src/kernel/qcursor_mac.cpp        |    4 ++++
+ src/kernel/qt_mac.h               |    2 +-
+ src/tools/qglobal.h               |    5 ++++-
+ 4 files changed, 10 insertions(+), 3 deletions(-)
+
+Index: config.tests/mac/mac_version.test
+===================================================================
+--- config.tests/mac/mac_version.test	2008-03-25 22:34:33.000000000 -0600
++++ config.tests/mac/mac_version.test	2008-03-25 22:35:07.000000000 -0600
+@@ -21,7 +21,7 @@ echo "#include <Carbon/Carbon.h>" >$TSTF
+ echo "#include <stdio.h>" >>$TSTFILE
+ echo "int main() {" >>$TSTFILE
+ echo "  long gestalt_version;" >>$TSTFILE
+-echo "  fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE
++/bin/echo "  fprintf(stdout, \"%d\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE
+ echo "  return 1;" >>$TSTFILE
+ echo "}" >>$TSTFILE
+ 
+Index: src/tools/qglobal.h
+===================================================================
+--- src/tools/qglobal.h	2008-03-25 22:34:33.000000000 -0600
++++ src/tools/qglobal.h	2008-03-25 22:35:07.000000000 -0600
+@@ -186,7 +186,10 @@
+ #  if !defined(MAC_OS_X_VERSION_10_4)
+ #       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1
+ #  endif
+-#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
++#  if !defined(MAC_OS_X_VERSION_10_5)
++#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1
++#  endif
++#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)
+ #    error "This version of Mac OS X is unsupported"
+ #  endif
+ #endif
+Index: src/kernel/qt_mac.h
+===================================================================
+--- src/kernel/qt_mac.h	2008-01-15 12:08:57.000000000 -0700
++++ src/kernel/qt_mac.h	2008-03-25 22:35:07.000000000 -0600
+@@ -60,7 +60,7 @@
+ # define QMAC_DEFAULT_STYLE "QMacStyle" //DefaultStyle
+ #endif
+ 
+-#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || QT_MACOSX_VERSION >= 0x1030
++#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || (QT_MACOSX_VERSION >= 0x1030 && QT_MACOSX_VERSION <= 0x1040)
+ # define QMAC_NO_FAKECURSOR
+ #endif
+ 
+Index: src/kernel/qcursor_mac.cpp
+===================================================================
+--- src/kernel/qcursor_mac.cpp	2008-03-25 22:34:33.000000000 -0600
++++ src/kernel/qcursor_mac.cpp	2008-03-25 22:35:07.000000000 -0600
+@@ -183,7 +183,9 @@ struct QCursorData : public QShared
+ #ifdef QMAC_USE_BIG_CURSOR_API
+ 	char *big_cursor_name;
+ #endif
++#ifdef QMAC_NO_FAKECURSOR
+ 	CursorImageRec *ci;
++#endif
+ 	struct {
+ 	    QMacAnimateCursor *anim;
+ 	    ThemeCursor curs;
+@@ -263,8 +265,10 @@ QCursorData::~QCursorData()
+     if(type == TYPE_CursPtr) {
+ 	if(curs.cp.hcurs && curs.cp.my_cursor)
+ 	    free(curs.cp.hcurs);
++#ifdef QMAC_NO_FAKECURSOR
+     } else if(type == TYPE_CursorImage) {
+ 	free(curs.ci);
++#endif
+ #ifdef QMAC_USE_BIG_CURSOR_API
+     } else if(type == TYPE_BigCursor) {
+ 	QDUnregisterNamedPixMapCursur(curs.big_cursor_name);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090308/3a5f0774/attachment.html>