Index: configure
===================================================================
--- configure	(revision 15252)
+++ configure	(working copy)
@@ -1570,6 +1570,10 @@
     enable  proc_opt
     disable v4l
     disable x11
+    osxver=`uname -r`
+    if [ ${osxver:0:1} = "9" ]; then
+        disable mmx
+    fi
     SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) -Wl,-read_only_relocs,suppress'
     VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$@'
     strip="strip -x"
Index: contrib/OSX/osx-packager.pl
===================================================================
--- contrib/OSX/osx-packager.pl	(revision 15252)
+++ contrib/OSX/osx-packager.pl	(working copy)
@@ -217,7 +217,72 @@
 #   },
   {
     'url'
-    =>  'http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/qt-mac-free-3.3.6.tar.gz',
+    =>  'http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/qt-mac-free-3.3.8.tar.gz',
+# qt3 Leopard patch from http://fink.cvs.sourceforge.net/*checkout*/fink/dists/10.4/unstable/main/finkinfo/graphics/qt3mac.patch2
+	'pre-conf'
+	=>	'echo "diff -ruN config.tests/mac/mac_version.test config.tests/mac/mac_version.test
+	--- config.tests/mac/mac_version.test	2004-04-23 09:40:40.000000000 -0700
+	+++ config.tests/mac/mac_version.test	2007-09-10 09:46:37.000000000 -0700
+	@@ -21,7 +21,7 @@
+	 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
+
+	diff -ruN src/tools/qglobal.h src/tools/qglobal.h
+	--- src/tools/qglobal.h	2007-02-02 06:01:04.000000000 -0800
+	+++ src/tools/qglobal.h	2007-09-10 09:31:43.000000000 -0700
+	@@ -183,7 +183,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
+	--- src/kernel/qt_mac.h	2007-02-02 15:01:13.000000000 +0100
+	+++ src/kernel/qt_mac.h	2007-10-29 13:14:12.000000000 +0100
+	@@ -54,7 +54,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
+
+	--- src/kernel/qcursor_mac.cpp	2007-02-02 15:01:16.000000000 +0100
+	+++ src/kernel/qcursor_mac.cpp	2007-10-29 15:02:36.000000000 +0100
+	@@ -177,7 +177,9 @@
+	 #ifdef QMAC_USE_BIG_CURSOR_API
+	 	char *big_cursor_name;
+	 #endif
+	+#ifdef QMAC_NO_FAKECURSOR
+	 	CursorImageRec *ci;
+	+#endif
+	 	struct {
+	 	    QMacAnimateCursor *anim;
+	 	    ThemeCursor curs;
+	@@ -257,8 +259,10 @@
+	     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);
+	" | patch -p0
+	',
     'conf-cmd'
     =>  'echo yes | ./configure',
     'conf'
Index: filters/postprocess/postprocess.pro
===================================================================
--- filters/postprocess/postprocess.pro	(revision 15252)
+++ filters/postprocess/postprocess.pro	(working copy)
@@ -8,7 +8,7 @@
 
 # Lots of symbols like pp_free_context, pp_free_mode, pp_get_context, pp_help
 # are used but not defined, which sometimes prevents linking on OS X.
-macx:LIBS += -undefined define_a_way
+macx:LIBS += -undefined dynamic_lookup
 
 mingw {
     SOURCES -= filter_postprocess.c