dbus 1.3.1 does not compile ...

[Andre Heinecke]

On Thursday, 29. July 2010 09:08:28 Patrick Spendrin wrote:
> Am 29.07.2010 08:17, schrieb Ralf Habacker:
> > Ralf Habacker schrieb:
> >> Christian Ehrlicher schrieb:
> >>> Applying the patch fails:
> >>> emerge debug: command: qmerge
> >>> patching file bus/main.c
> >>> Assertion failed: hunk, file ../patch-2.5.9-src/patch.c, line 354
> >>
> >> This is an eol problem in dbus-scopes.diff This patch is also used for
> >> git checkout using git apply, which needs unix eol, while using patch
> >> requires windows eol.
This should be fixed now by coverting patches that have \n line endings
to \r\n directly in the applypatch function so patches in merge no longer have 
to be commited with native eol style properties
> Sorry, we forgot to adapt the patch when we changed from the git tag to
> the tarball, but we will fix this in a minute.
I did add a patch with crlf line endings but then Sascha Teichmann wrote the 
ptch to Utils.py i've commited with revs 1156651, 1156609 to solve the 
problem in a better more permanent way and so i've reverted my changes to 
DBus again.

Regardsr
Andre

-- 
Andre Heinecke |  ++49-541-335083-262 |  http://www.intevation.de/
Intevation GmbH, Neuer Graben 17, 49074 Osnabrück | AG Osnabrück, HR B 18998
Geschäftsführer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner