--- osx-packager-qtsdk.pl.orig	2012-10-05 21:09:14.000000000 -0500
+++ osx-packager-qtsdk.pl	2012-10-05 20:57:12.000000000 -0500
@@ -906,7 +911,7 @@
         'url'  => "$sourceforge/sourceforge/flac/flac-1.2.1.tar.gz",
         # Workaround Intel problem - Missing _FLAC__lpc_restore_signal_asm_ia32
         'conf' => [
-            '--disable-asm-optimizations',
+            '--disable-asm-optimizations', '--disable-cpplibs',
         ],
         # patch to support universal compilation and fix incorrect sizeof
         'post-conf' => "echo \"/#define SIZEOF_VOIDP/c\n" .
@@ -950,6 +955,9 @@
             'mysqlclient',
             'libmysql',
         ],
+        'post-make'     => 'mkdir $PREFIX/include/mysql; cp -R include/*.h $PREFIX/include/mysql; '.
+                           'mkdir $PREFIX/lib/mysql; cp -R -L libmysql/* $PREFIX/lib/mysql;'.
+                           'mkdir $PREFIX/mysql; cp -R -L libmysql/* $PREFIX/mysql;',
     },
 
     'dbus' =>
@@ -974,7 +982,7 @@
     'qt'
     =>
     {
-        'url' => "http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${QTVERSION}.tar.gz",
+        'url' => "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${QTVERSION}.tar.gz",
         'pre-conf'
         =>  # Get around Qt bug QTBUG-24498 (4.8.0) && stupid thing can't compile in release mode on mac without framework active
         #also hack for QTBUG-23258