[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-cygwin
Subject:    Re: qt 3.1 port planing
From:       Bob Tanner <tanner () real-time ! com>
Date:       2002-12-04 8:31:12
[Download RAW message or body]

On Wednesday 04 December 2002 02:17 am, Bob Tanner wrote:
> On Tuesday 26 November 2002 06:24 pm, Ralf Habacker wrote:
> > $cd <your qt-3-snapshot>
> > $cvs import -m "QT 3.1.0 rc2 Release" qt-3 QT_IMPORT qt_3_1_0_rc2
> >
> > $ cerate a diff file
> > $ cd <your checked out qt-3 dir>
> > $ cvs diff -ubB -r qt_3_1_0_rc1 -r qt_3_1_0_rc2  | tee qt310_rc1_rc2.dif
> > $ patch -p0 <qt310_rc1_rc2.dif
> > $ cvs ci -m "update to qt3.1.0 rc2"
>
> Got everything patched, but something broke in the merge. Example explains
> it best:
>
> g++ -c -o pbuilder_pbx.o -g -I. -Igenerators -Igenerators/unix
> -Igenerators/win32  -Igenerators/mac -I@OUT_QTDIR@/include
> -I@REL_QTDIR@/include -I@OUT_QTDIR@/src/tools -DQT_NO_TEXTCODEC
> -DQT_NO_COMPONENT -DQT_NO_STL -I/cygdrive/r/BUILD/qt-3/mkspecs/cygwin-g++
> generators/mac/pbuilder_pbx.cpp
>
> @OUT_QTDIR@
> @REL_QTDIR@
> @OUT_QTDIR@
>
> Are not being replaced. This worked before the merge, so I must have missed
> something or messed something up.

Found the problem, messed up merge of configure. I'll work on it tommorrow. 

-- 
Bob Tanner <tanner@real-time.com>         | Phone : (952)943-8700
http://www.mn-linux.org, Minnesota, Linux | Fax   : (952)943-8500
http://www.linuxjustworks.com             | Linux Just Works!         
Key fingerprint = AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288
_______________________________________________
kde-cygwin mailing list
kde-cygwin@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-cygwin
[prev in list] [next in list] [prev in thread] [next in thread]