Ticket #4397: win32-packager.24.patch

File win32-packager.24.patch, 3.5 KB (added by davidbuzz@…, 11 years ago)

patch to remove 4706 which is no longer required, tweak QT4 build parameters (both debug and release), and to comment-out the part of the QT4 build that skips the examples as it's flawed.

  • win32-packager.pl

     
    4242$| = 1; # autoflush stdout;
    4343
    4444# this script was last tested to work with this version, on other versions YMMV.
    45 my $SVNRELEASE = '16789'; # Latest build that has been confirmed to run,
     45#my $SVNRELEASE = '16789'; # Latest build that has been confirmed to run,
    4646                          # but seems to work best with some patches
    4747                          # (included below). This is the last version that is
    4848                          # Qt 3 based. Qt 4 merges began immediately after.
    4949#my $SVNRELEASE = '16973'; # Recent 0-21-fixes
    50 #my $SVNRELEASE = '17011'; # Recent trunk
     50my $SVNRELEASE = '17131'; # Recent trunk
    5151#my $SVNRELEASE = 'HEAD'; # If you are game, go forth and test the latest!
    5252
    5353
     
    631631[ archive => $sources.'qt-win-opensource-src-4.3.4.zip',  fetch => 'ftp://ftp.trolltech.com/qt/source/qt-win-opensource-src-4.3.4.zip'],
    632632[ dir => $msys.'qt-win-opensource-src-4.3.4', extract => [$sources.'qt-win-opensource-src-4.3.4.zip', $msys] ],
    633633
    634 [dir => $msys.'qt-win-opensource-src-4.3.4_examples', shell => 'mv '.$unixmsys.'qt-win-opensource-src-4.3.4/examples '.$unixmsys.'qt-win-opensource-src-4.3.4_examples',
    635   comment => 'after extracting the qt sources, there is no need for us to build the examples, so we will just move the folder out of the way (we could just delete it but dont)! ' ] ,
     634#[dir => $msys.'qt-win-opensource-src-4.3.4_examples', shell => 'mv '.$unixmsys.'qt-win-opensource-src-4.3.4/examples '.$unixmsys.'qt-win-opensource-src-4.3.4_examples',
     635#  comment => 'after extracting the qt sources, there is no need for us to build the examples, so we will just move the folder out of the way (we could just delete it but dont)! ' ] ,
    636636
    637637# qt recommend NOT having sh.exe in the path when building QT (yes this applies to QT4 too!)
    638638[ file => $msys.'bin/sh_.exe',
     
    651651set PATH=%QTDIR%\bin;%MINGW%\bin;%PATH%
    652652set QMAKESPEC=win32-g++
    653653cd %QTDIR%
    654 configure -plugin-sql-mysql -no-sql-sqlite -release -fast -no-sql-odbc -no-qdbus
     654configure -plugin-sql-mysql -no-sql-sqlite -debug-and-release -fast -no-sql-odbc -no-qdbus
    655655rem mingw32-make
    656656','nocheck'
    657657],comment=>'write a batch script for the QT4 environment under DOS'],
     
    815815[ filesame => [$mythtv.'mythtv/4724_undo.patch',$sources."4724_undo.patch"], copy => [''=>'',comment => 'XXXX'] ],
    816816[ grep  => ['BLABLA',$mythtv.'mythtv/libs/libmyth/mythcontext.cpp'], shell => ["cd ".$unixmythtv."mythtv/libs/libmyth","patch -p0 < ../../".$unixmythtv."mythtv/4724_undo.patch",'nocheck'] , comment => ' .'],
    817817
    818 #4706 http://svn.mythtv.org/trac/raw-attachment/ticket/4706/mythsocket_win32_events.patch
    819 [ archive => $mythtv.'mythtv/mythsocket_win32_events.patch' , 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/4706/mythsocket_win32_events.patch', comment => 'mythsocket_win32_events.patch - apply any outstanding win32 patches - this section will be hard to keep upwith HEAD/SVN'],
    820 [ file => $mythtv.'_', shell => ["cd ".$unixmythtv."mythtv","patch -p0 < ".$unixmythtv."mythtv/mythsocket_win32_events.patch","nocheck"] , comment => 'apply above patch'],
    821 
    822818# Ticket 4699
    823819[ archive => $sources.'4699_win32_fs.patch', 'fetch' => 'http://svn.mythtv.org/trac/raw-attachment/ticket/4699/win32_fs.patch', comment => 'win32_fs.patch'],
    824820[ filesame => [$mythtv.'mythtv/4699_win32_fs.patch',$sources."4699_win32_fs.patch"], copy => [''=>'',comment => 'XXXX'] ],