--------------Boundary-00=_5U4V5Y1KW72PSQ5WVGBK
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable

> That sound good, can you send this perl script to this list, so that I =
can
> add it to the cvs tools dir for future requests ?
> Additional I've tried this, but without success, so I'm interessted to =
seen
> how this works. :-)

Attached.

As an aside, the patch, bzip'd is still 2.4M. Since I do not have write a=
ccess=20
to cvs yet, I've put the patch here:

http://www.tanners.org/~tanner/downloads/cygwin/qt_3_0_4-qt_3_1_0_rc1-cyg=
win.patch.bz2

Now, this is only a patch to #2 of the issues Ralf listed. There are stil=
l=20
OTHER conflicts that I did not fix.

--=20
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!        =20
Key fingerprint =3D AB15 0BDF BCDE 4369 5B42  1973 7CF1 A709 2CC1 B288

--------------Boundary-00=_5U4V5Y1KW72PSQ5WVGBK
Content-Type: text/x-perl;
  charset="iso-8859-1";
  name="fix-id.pl"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="fix-id.pl"

#!/usr/bin/perl -w

use strict;

my $filename = shift || die "Usage:\n\t$0 <conflictingfile>\n";

open(FH, "$filename") || die $!;
my $content = "";
{ local $/; $content = <FH>; }
close(FH);

$content =~ s/\<{7} \S+\s+([^\=]+)=======\s+[^\>]+\>{7} \S+\s+/$1/gm;

open(FH, ">$filename") || die $!;
print FH $content;
close(FH);


--------------Boundary-00=_5U4V5Y1KW72PSQ5WVGBK--
_______________________________________________
kde-cygwin mailing list
kde-cygwin@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-cygwin