Ticket #6546: win32pkg.patch

win32-packager.pl

@@ -478 +478 @@
 #     mysql-essential-5.1.30-win32.msi/from/http://mysql.mirrors.ilisys.com.au/
 # alternate: http://mysql.mirrors.ilisys.com.au/Downloads/MySQL-5.1/
 #     mysql-essential-5.1.30-win32.msi
-[ archive => $sources.'mysql-essential-5.1.31-win32.msi',
+[ archive => $sources.'mysql-essential-5.1.33-win32.msi',
   'fetch' => 'http://mysql.mirrors.ilisys.com.au/Downloads/'.
-             'MySQL-5.1/mysql-essential-5.1.31-win32.msi',
+             'MySQL-5.1/mysql-essential-5.1.33-win32.msi',
   comment => 'fetch mysql binaries - this is a big download(35MB) '.
              'so it might take a while' ],
 [ file    => "c:/Program Files/MySQL/MySQL Server 5.1/bin/libmySQL.dll",
-  exec    => $dossources.'mysql-essential-5.1.31-win32.msi INSTALLLEVEL=2',
+  exec    => $dossources.'mysql-essential-5.1.33-win32.msi INSTALLLEVEL=2',
   comment => 'Install mysql - be sure to choose to do a "COMPLETE" install. '.
              'You should also choose NOT to "configure the server now" ' ],
 
@@ -590 +590 @@
  long double __cdecl __MINGW_NOTHROW strtold (const char * __restrict__, char ** __restrict__);
 ' ],comment => 'write the patch for the the stdlib.h file'],
 # apply it!?
-[ grep    => ['__inline__ double __cdecl __MINGW_NOTHROW strtod ',$mingw.'include/stdlib.h'], 
+# mingwrt-3.15.2 already patched but has <CR> before strtod, so just
+# grep for the __inline__ statement before it (only instance in the file)
+[ grep    => ['__inline__ double __cdecl __MINGW_NOTHROW',$mingw.'include/stdlib.h'], 
   shell   => ["cd /mingw/include","patch -p1 < stdlib_h.patch"],
   comment => 'Apply stdlib.h patch file, if not already applied....' ],
 
@@ -650 +652 @@
 +/* Define to `int' if <sys/types.h> does not define. */
 +/* GCC 4.x reportedly defines pid_t. */
 +#ifndef _PID_T_
++#define _PID_T_
 +#define pid_t int
 +#endif
 +#endif
@@ -1836 +1839 @@
 mkdir '.$unixmythtv.'/build/bin/sqldrivers
 echo Copying QT plugin required dlls....
 cp '.$unixmsys.'qt-3.3.x-p8/plugins/sqldrivers/libqsqlmysql.dll '.$unixmythtv.'build/bin/sqldrivers 
-cp '.$unixmsys.'qt-win-opensource-src-4.4.3/plugins/sqldrivers/qsqlmysql4.dll '.$unixmythtv.'build/bin/sqldrivers 
+cp '.$unixmsys.'qt-win-opensource-src-4.4.3/plugins/sqldrivers/*.dll '.$unixmythtv.'build/bin/sqldrivers 
+cp '.$unixmsys.'qt-win-opensource-src-4.4.3/plugins/codecs/*.a '.$unixmythtv.'build/lib/ 
+cp '.$unixmsys.'qt-win-opensource-src-4.4.3/plugins/codecs/*.dll '.$unixmythtv.'build/bin/ 
 echo Copying ming and msys dlls to build folder.....
 # pthread dlls and mingwm10.dll are copied from here:
 cp /mingw/bin/*.dll '.$unixmythtv.'build/bin