[Kde-cygwin-cvs] CVS: qt-3 patched-original-files.txt, NONE, 1.1.2.1

[Ralf Habacker]

Hi Peter, 
On Friday 28 January 2005 14:40, you wrote:
> Update of /cvsroot/kde-cygwin/qt-3
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12777
>
> Added Files:
>       Tag: QT_WIN32_3_3_BRANCH
>  patched-original-files.txt
> Log Message:
> add document file for changes of original Trolltech file
>
> --- NEW FILE: patched-original-files.txt ---
> This files documents changes of original Trolltech files.
>
> Making our live more simple, patching original files should be
> avoided because such patches get lost when we upgrade the
> Trolltech files.
>
> If you nevertheless change Trolltech files
> 1. you must have a very good reasons
> 2. you must document and explain your changes in this file
> 3. and you should add the diff against the original file (mail from the
> kde-cygwin--cvs list).
>
do you have thought, that issue 2 and 3 are already in cvs and can be 
retrieved any time using a cvs log and/or cvs diff commend using the version 
qt_3_3_3  and QT_WIN32_3_3_BRANCH 

For example 

find -name '*.cpp' -o -name '*.h ' | grep -v "_win*" | xargs cvs diff -r 
QT_WIN32_3_3_BRANCH -r qt_3_3_3 

find -name '*.cpp' -o -name '*.h ' | grep -v "_win*" | xargs cvs log -r 
QT_WIN32_3_3_BRANCH -r qt_3_3_3 

I think this would be like reinventing the wheel.  In the past I have imported 
all original qt release any ported release is based on on the QT_IMPORT  
branch for exactly this reason. :-)

What about writing a little shell script or batch file, which uses cvs to 
retrieve exactly this information ? 

Regards 
Ralf 

>
>
> Version 3.3.3 changes
> *********************
>
>
>
> *   qmake/makefile.cpp (Peter Kuemmel)
> ___________________________________________________________________________
>______________________________________________
>
> qmake crashes when compiled with MSVC 8 beta
> (MSVC 8 don't likes NULL strings: error in open.c)
>
> Index: makefile.cpp
> ===================================================================
> RCS file: /cvsroot/kde-cygwin/qt-3/qmake/generators/makefile.cpp,v
> retrieving revision 1.1.1.8
> retrieving revision 1.1.1.9
> diff -u -r1.1.1.8 -r1.1.1.9
> --- makefile.cpp	27 Aug 2004 21:08:23 -0000	1.1.1.8
> +++ makefile.cpp	26 Nov 2004 14:33:04 -0000	1.1.1.9
> @@ -113,6 +113,7 @@
>
>      QString fn_local = Option::fixPathToLocalOS(fileFixify(fn_target,
> QDir::currentDirPath(), Option::output_dir));
>
> +	if ( !fn_local) fn_local = ""; // MSVC 8 don't likes NULL strings: error
> in open.c int file = open(fn_local.latin1(), O_RDONLY);
>      if(file == -1)
>  	return FALSE;
> @@ -248,6 +249,7 @@
>
>      QStringList &fndeps = findDependencies(f);
>      QString fn = fileFixify(f, QDir::currentDirPath(),
> Option::output_dir); +    if ( !fn) fn = ""; // MSVC 8 don't likes NULL
> strings: error in open.c fn = Option::fixPathToLocalOS(fn, FALSE);
>      QString fix_env_fn = Option::fixPathToLocalOS(fn);
> ___________________________________________________________________________
>______________________________________________
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
> Tool for open source databases. Create drag-&-drop reports. Save time
> by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
> Download a FREE copy at http://www.intelliview.com/go/osdn_nl
> _______________________________________________
> Kde-cygwin--cvs mailing list
> Kde-cygwin--cvs at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/kde-cygwin--cvs