Qt-jambi-interest Archive, May 2007
Installing patches
Message 1 in thread
Hello!
Could we get a quick intro to how we apply the patches that are mailed
to us? I haven't been working with native Qt before, so we are quite
blank on this.
Regards,
Helge Fredriksen
Message 2 in thread
On Friday 04 May 2007 13:36, Helge Fredriksen wrote:
> Hello!
>
> Could we get a quick intro to how we apply the patches that are mailed
> to us? I haven't been working with native Qt before, so we are quite
> blank on this.
Hi,
To apply a patch automatically you need a program called `patch'. `patch'
takes a patch file containing a difference listing produced by diff and
applies those differences to one or more original files, producing patched
versions.
If you are running windows, you can download it from here:
http://gnuwin32.sourceforge.net/packages/patch.htm
To apply the patches we send out, you will do something like this:
1. Save the patch that you receive in this mailing list in the root of the
qtjambi source package. (patch-1.diff)
2. In my console I run:
haavardf@haavardf:~/Download/qtjambi-src-gpl-1.0.0-beta2$ patch --verbose <
patch.diff
Hmm...missing header for unified diff at line 3 of patch
Looks like a unified diff to me...
can't find file to patch at input line 3
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|==== com/trolltech/qt/QSignalEmitter.java#8 (text) ====
|
--------------------------
File to patch: com/trolltech/qt/QSignalEmitter.java
Patching file com/trolltech/qt/QSignalEmitter.java using Plan A...
Hunk #1 succeeded at 370.
Hunk #2 succeeded at 402.
Hunk #3 succeeded at 429.
done
Then your code should be updated. Sometimes you will receive a patch that are
made from our depo, then it might look like this:
//depot/qtjambi/main/qtjambi_gui/qtreemodel.cpp#11 edit
the file you then want to patch is: qtjambi_gui/qtreemodel.cpp
Hope this helps.
Best regards
Håvard F
