Re: [Opensync-users] How to patch libsoup?

[Armin B. <arm...@de...>]

sorry! did not write this to the list yet:

You dont need to patch libsoup anymore. All patches are now upstream. So
if you check out from cvs it will be just fine.

Sorry again for the confusion!

Armin

Conrad Wolf wrote:
> Hi all!
> 
> I'm new to this list and I've been trying to follow the guide to install
> the SyncML-plugin. Installing
> 
> libopensync-0.18,
> multisync-0.90.18,
> libopensync-plugin-file-0.18
> and libopensync-plugin-evolution2-0.18
> 
> worked well. Next I checked out libsyncml and libsoup as mentioned in
> the guide, but when it came to patching libsoup, I couldn't find out how
> to actually do it. I entered the libsoup directory and tried to apply
> the patch from libsyncml like this:
> 
> libsoup # patch -p1 <.../libsyncml/misc/libsoup-async-dns.patch
> 
> The output I became showed that the patching failed for several 'hunks':
> 
> patching file ChangeLog
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file ChangeLog.rej
> patching file libsoup/soup-address.c
> Hunk #2 succeeded at 397 with fuzz 2.
> Hunk #3 FAILED at 409.
> 1 out of 3 hunks FAILED -- saving rejects to file
> libsoup/soup-address.c.rej
> patching file libsoup/soup-address.h
> Hunk #1 succeeded at 81 with fuzz 2 (offset 4 lines).
> patching file libsoup/soup-dns.c
> Hunk #2 FAILED at 506.
> Hunk #3 succeeded at 555 with fuzz 1 (offset 4 lines).
> Hunk #4 FAILED at 563.
> Hunk #5 succeeded at 574 (offset 5 lines).
> Hunk #6 FAILED at 584.
> 3 out of 6 hunks FAILED -- saving rejects to file libsoup/soup-dns.c.rej
> patching file libsoup/soup-dns.h
> Hunk #1 succeeded at 39 with fuzz 2 (offset 1 line).
> patching file libsoup/soup-socket.c
> Hunk #1 FAILED at 569.
> 1 out of 1 hunk FAILED -- saving rejects to file
> libsoup/soup-socket.c.rej
> patching file tests/dns.c
> 
> When I thereafter try to compile libsoup, compilation fails with the
> following output:
> 
> soup-address.c:401: error: conflicting types for
> `soup_address_resolve_async'
> soup-address.h:80: error: previous declaration of
> `soup_address_resolve_async'
> soup-address.c: In function `soup_address_resolve_async':
> soup-address.c:402: error: too few arguments to function
> `soup_address_resolve_async_full'
> soup-address.c: At top level:
> soup-address.c:419: error: conflicting types for
> `soup_address_resolve_async_full'
> soup-address.h:85: error: previous declaration of
> `soup_address_resolve_async_full'
> soup-address.c: In function `soup_address_resolve_async_full':
> soup-address.c:430: error: too few arguments to function
> `soup_dns_lookup_resolve_async'
> make[2]: *** [soup-address.lo] Fehler 1
> make[2]: Leaving directory `/usr/local/src/svn/libsoup/libsoup'
> make[1]: *** [install] Fehler 2
> make[1]: Leaving directory `/usr/local/src/svn/libsoup/libsoup'
> make: *** [install-recursive] Fehler 1
> 
> Did I do the patching wrong? Any help would be appreciated.
> 
> Conrad.
> 
>