how to patch?

[fengxb]

Hi,

I have a simple problem about how to patch the Ice? The post looks like using patch tool. Where can I get the tool?

Thanks in advance.

Feng Xuebin

[benoit]

Hi,

The patch utility is installed with most Unix distributions. On Windows, it's available with Cygwin. There might be other binary package available such as the one from here.

Cheers,
Benoit.

[fengxb]

Thanks a lot for your rapid response.

I downloaded the tool and executed the command, but patching seems not succeed at all.

The following is the response:

patching file src/IceUtil/Cond.cpp
missing header for context diff at line 261 of patch
can't find file to patch at input line 261
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|l::Cond::wake(bool broadcast)

Regards,

Feng Xuebin

[benoit]

Strange, it works fine for me with the patch utility from Cygwin. Did you try with the patch utility from Cygwin? Does the patch file look correct (check line 261 for instance)? Perhaps your patch utility is being confused by the Unix end of lines, if you have the unix2dos utility you could try to convert the patch.txt file to a DOS file and see if it helps.

In any case since the patch only affects one file, I've attached the zipped patched file to this post, unzip it and copy it in your Ice-3.2.0/src/IceUtil directory if you can't use the patch.

Cheers,
Benoit.

[fengxb]

Hi Benoit,

Thank you very much.